[incubator-openwhisk] branch master updated: Optional package (#3128)

[du...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dubeejw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new 4285cc2  Optional package (#3128)
4285cc2 is described below

commit 4285cc2791d56a486d0c52ca92b6f51abe3026d9
Author: Belinda Vennam <be...@gmail.com>
AuthorDate: Wed Jan 3 10:18:04 2018 -0600

    Optional package (#3128)
    
    * adding variable for toggling optional packages
---
 ansible/tasks/installOpenwhiskCatalog.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ansible/tasks/installOpenwhiskCatalog.yml b/ansible/tasks/installOpenwhiskCatalog.yml
index 699fd7c..73c3cbe 100644
--- a/ansible/tasks/installOpenwhiskCatalog.yml
+++ b/ansible/tasks/installOpenwhiskCatalog.yml
@@ -18,6 +18,7 @@
 
 - set_fact:
     skip_catalog_install="{{ item.value.skip | default(false) }}"
+    optional_package_skip="{{ item.value.optional_package_skip | default(true) }}"
 
 - name: "ensure catalog_location directory exists"
   file:
@@ -32,7 +33,7 @@
     version: "{{ version }}"
 
 - name: install the catalog from the catalog location
-  shell: ./installCatalog.sh {{ catalog_auth_key }} {{ api_host }} {{ cli.path }} chdir="{{ catalog_location }}/packages"
+  shell: ./installCatalog.sh {{ catalog_auth_key }} {{ api_host }} {{ cli.path }} chdir="{{ catalog_location }}/packages" "{{ optional_package_skip }}"
   environment:
     OPENWHISK_HOME: "{{ openwhisk_home }}"
   when: skip_catalog_install == false

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].