Install routemgmt package when running API gateway playbook.

The routemgmt playbook remains its own independent playbook so that it may be installed seperately when necessary.

ansible/README.md

@@ -153,13 +153,12 @@ ansible-playbook -i environments/<environment> postdeploy.yml
 
 # to use the API gateway
 ansible-playbook -i environments/<environment> apigateway.yml
-ansible-playbook -i environments/<environment> routemgmt.yml
 ```
 
 - You need to run `initdb.yml` **every time** you do a fresh deploy CouchDB to initialize the subjects database.
 - The `wipe.yml` playbook should be run on a fresh deployment only, otherwise actions and activations will be lost.
 - Run `postdeploy.yml` after deployment to install a catalog of useful packages.
-- To use the API Gateway, you'll need to run `apigateway.yml` and `routemgmt.yml`.
+- To use the API Gateway, you'll need to run `apigateway.yml`.
 - Use `ansible-playbook -i environments/<environment> openwhisk.yml` to avoid wiping the data store. This is useful to start OpenWhisk after restarting your Operating System.
 
 #### Limitation
@@ -186,14 +185,13 @@ ansible-playbook -i environments/<environment> postdeploy.yml
 
 # to use the API gateway
 ansible-playbook -i environments/<environment> apigateway.yml
-ansible-playbook -i environments/<environment> routemgmt.yml
 ```
 
 - You need to run `initdb` on Cloudant **only once** per Cloudant database to initialize the subjects database.
 - The `initdb.yml` playbook will only initialize your database if it is not initialized already, else it will skip initialization steps.
 - The `wipe.yml` playbook should be run on a fresh deployment only, otherwise actions and activations will be lost.
 - Run `postdeploy.yml` after deployment to install a catalog of useful packages.
-- To use the API Gateway, you'll need to run `apigateway.yml` and `routemgmt.yml`.
+- To use the API Gateway, you'll need to run `apigateway.yml`.
 - Use `ansible-playbook -i environments/<environment> openwhisk.yml` to avoid wiping the data store. This is useful to start OpenWhisk after restarting your Operating System.
 
 ### Configuring the installation of `wsk` CLI

ansible/README_DISTRIBUTED.md

@@ -91,7 +91,6 @@ ansible-playbook -i environments/<environment> postdeploy.yml
 
 # to use the API gateway
 ansible-playbook -i environments/<environment> apigateway.yml
-ansible-playbook -i environments/<environment> routemgmt.yml
 ```
 
 Setup your CLI and verify that OpenWhisk is working.

ansible/apigateway.yml

@@ -8,3 +8,5 @@
 - hosts: apigateway
   roles:
   - apigateway
+
+- import_playbook: routemgmt.yml

tools/build/redo

@@ -281,7 +281,7 @@ Components = [
                   'deploy api gateway',
                   gradle = False,
                   modes = 'clean',
-                  yaml = 'routemgmt.yml apigateway.yml'),
+                  yaml = 'apigateway.yml'),
 
     # the following (re)build images via gradle
 

tools/travis/setupSystem.sh

@@ -27,6 +27,5 @@ cd $ROOTDIR/ansible
 
 $ANSIBLE_CMD openwhisk.yml
 $ANSIBLE_CMD apigateway.yml
-$ANSIBLE_CMD routemgmt.yml
 
 echo "Time taken for ${0##*/} is $SECONDS secs"

tools/vagrant/Vagrantfile

@@ -152,7 +152,6 @@ Vagrant.configure('2') do |config|
     su vagrant -c 'ansible-playbook -i environments/vagrant openwhisk.yml -e invoker_use_runc=False'
     su vagrant -c 'ansible-playbook -i environments/vagrant postdeploy.yml'
     su vagrant -c 'ansible-playbook -i environments/vagrant apigateway.yml'
-    su vagrant -c 'ansible-playbook -i environments/vagrant routemgmt.yml'
 
     # Setup OpenWhisk CLI
     su vagrant -c 'mkdir ${HOME}/bin'