[incubator-openwhisk] branch master updated: Env variable instead of parameter (#3144)

[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 713e6a0  Env variable instead of parameter (#3144)
713e6a0 is described below

commit 713e6a0ae396f114b5cb106db7f1ad26009bb0cd
Author: Belinda Vennam <be...@gmail.com>
AuthorDate: Fri Jan 5 13:30:32 2018 -0500

    Env variable instead of parameter (#3144)
    
    * env variable instead of parameter
    
    * more generic environment_catalog
---
 ansible/tasks/installOpenwhiskCatalog.yml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/ansible/tasks/installOpenwhiskCatalog.yml b/ansible/tasks/installOpenwhiskCatalog.yml
index 73c3cbe..4b5eac5 100644
--- a/ansible/tasks/installOpenwhiskCatalog.yml
+++ b/ansible/tasks/installOpenwhiskCatalog.yml
@@ -20,6 +20,17 @@
     skip_catalog_install="{{ item.value.skip | default(false) }}"
     optional_package_skip="{{ item.value.optional_package_skip | default(true) }}"
 
+- set_fact:
+    environment_catalog:
+      OPENWHISK_HOME: "{{ openwhisk_home }}"
+
+- set_fact:
+    environment_catalog: "{{ environment_catalog | combine( { the_item.key: the_item.value } ) }}"
+  when: item.value.environment is defined
+  with_dict: "{{ item.value.environment }}"
+  loop_control:
+    loop_var: the_item
+
 - name: "ensure catalog_location directory exists"
   file:
     path: "{{ catalog_location }}"
@@ -33,7 +44,6 @@
     version: "{{ version }}"
 
 - name: install the catalog from the catalog location
-  shell: ./installCatalog.sh {{ catalog_auth_key }} {{ api_host }} {{ cli.path }} chdir="{{ catalog_location }}/packages" "{{ optional_package_skip }}"
-  environment:
-    OPENWHISK_HOME: "{{ openwhisk_home }}"
+  shell: ./installCatalog.sh {{ catalog_auth_key }} {{ api_host }} {{ cli.path }} chdir="{{ catalog_location }}/packages"
+  environment: "{{ environment_catalog }}"
   when: skip_catalog_install == false

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