dubeejw closed pull request #3144: Env variable instead of parameter
URL: https://github.com/apache/incubator-openwhisk/pull/3144
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ansible/tasks/installOpenwhiskCatalog.yml
b/ansible/tasks/installOpenwhiskCatalog.yml
index 73c3cbe551..4b5eac51ff 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
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
