Add API gateway to redo.

apache · Jun 13, 2018 · d957511 · d957511
1 parent 008996d
commit d957511
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/ansible/openwhisk.yml b/ansible/openwhisk.yml
@@ -13,4 +13,8 @@
 
 - import_playbook: edge.yml
 
+# the next playbook must follow the edge playbook since it downloads
+# the wsk binary from the edge host.
+- import_playbook: downloadcli.yml
+
 - import_playbook: routemgmt.yml
diff --git a/ansible/roles/routemgmt/files/installRouteMgmt.sh b/ansible/roles/routemgmt/files/installRouteMgmt.sh
@@ -13,7 +13,6 @@
 # WSK_CLI="$OPENWHISK_HOME/bin/wsk"
 
 set -e
-set -x
 
 if [ $# -eq 0 ]
 then
@@ -42,6 +41,11 @@ if [ -f "$AUTH" ]; then
     AUTH=`cat $AUTH`
 fi
 
+if [ ! -f $WSK_CLI ]; then
+    echo $WSK_CLI is missing
+    exit 1
+fi
+
 export WSK_CONFIG_FILE= # override local property file to avoid namespace clashes
 
 echo Installing apimgmt package

diff --git a/ansible/roles/routemgmt/files/uninstallRouteMgmt.sh b/ansible/roles/routemgmt/files/uninstallRouteMgmt.sh
@@ -8,12 +8,11 @@
 # automatically
 #
 # To run this command
-# ./installRouteMgmt.sh  <AUTH> <APIHOST> <NAMESPACE> <WSK_CLI>
+# ./uninstallRouteMgmt.sh  <AUTH> <APIHOST> <NAMESPACE> <WSK_CLI>
 # AUTH, APIHOST and NAMESPACE are found in $HOME/.wskprops
 # WSK_CLI="$OPENWHISK_HOME/bin/wsk"
 
 set -e
-set -x
 
 if [ $# -eq 0 ]
 then
@@ -31,6 +30,11 @@ if [ -f "$AUTH" ]; then
     AUTH=`cat $AUTH`
 fi
 
+if [ ! -f $WSK_CLI ]; then
+    echo $WSK_CLI is missing
+    exit 1
+fi
+
 export WSK_CONFIG_FILE= # override local property file to avoid namespace clashes
 
 function deleteAction

diff --git a/ansible/routemgmt.yml b/ansible/routemgmt.yml
@@ -7,5 +7,4 @@
 
 - hosts: ansible
   roles:
-  - cli-install
   - routemgmt
diff --git a/tools/build/redo b/tools/build/redo
@@ -268,10 +268,21 @@ Components = [
     makeComponent('edge',
                   'deploy edge'),
 
+    makeComponent('cli',
+                  'download cli from api host',
+                  modes = 'clean',
+                  yaml = 'downloadcli.yml'),
+
     makeComponent('catalog',
                   'install catalog',
                   yaml = 'postdeploy.yml'),
 
+    makeComponent('apigw',
+                  'deploy api gateway',
+                  gradle = False,
+                  modes = 'clean',
+                  yaml = 'routemgmt.yml apigateway.yml'),
+
     # the following (re)build images via gradle
 
     makeComponent('nodejs6action',