jasonpet closed pull request #3573: use whisk_api_host_name as part of api host
ansible selection
URL: https://github.com/apache/incubator-openwhisk/pull/3573
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/roles/routemgmt/tasks/deploy.yml
b/ansible/roles/routemgmt/tasks/deploy.yml
index f1e12a23d6..5390eb6fb6 100644
--- a/ansible/roles/routemgmt/tasks/deploy.yml
+++ b/ansible/roles/routemgmt/tasks/deploy.yml
@@ -16,6 +16,6 @@
---
# Install the API Gateway route management actions.
- name: install route management actions
- shell: ./installRouteMgmt.sh {{ catalog_auth_key }} {{ groups['edge'] |
first }} {{ catalog_namespace }} {{ cli.path }} chdir="{{ openwhisk_home
}}/ansible/roles/routemgmt/files"
+ shell: ./installRouteMgmt.sh {{ catalog_auth_key }} {{ whisk_api_host_name |
default(groups['edge'] | first) }} {{ catalog_namespace }} {{ cli.path }}
chdir="{{ openwhisk_home }}/ansible/roles/routemgmt/files"
environment:
OPENWHISK_HOME: "{{ openwhisk_home }}"
diff --git a/ansible/tasks/installOpenwhiskCatalog.yml
b/ansible/tasks/installOpenwhiskCatalog.yml
index 0647a70cea..640f957fa1 100644
--- a/ansible/tasks/installOpenwhiskCatalog.yml
+++ b/ansible/tasks/installOpenwhiskCatalog.yml
@@ -19,7 +19,7 @@
- set_fact:
catalog_location={{ item.value.location }}
catalog_repo_url={{ item.value.url }}
- api_host={{ groups['edge'] | first }}
+ api_host={{ whisk_api_host_name | default(groups['edge'] | first) }}
version="HEAD"
repo_update="yes"
----------------------------------------------------------------
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
