[GitHub] cbickel closed pull request #3536: Remove env_hosts_dir ansible variable.

[GitBox <gi...@apache.org>]

cbickel closed pull request #3536: Remove env_hosts_dir ansible variable.
URL: https://github.com/apache/incubator-openwhisk/pull/3536
 
 
   

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/environments/distributed/group_vars/all b/ansible/environments/distributed/group_vars/all
index c36424b840..6fbfe032fb 100755
--- a/ansible/environments/distributed/group_vars/all
+++ b/ansible/environments/distributed/group_vars/all
@@ -14,8 +14,6 @@ registry_storage_dir: "/"
 docker_registry: "{{ groups['registry'] | first }}:5000/"
 docker_dns: ""
 
-env_hosts_dir: "{{ playbook_dir }}/environments/distributed"
-
 registry:
   version: 2.3.1
   port: 5000
diff --git a/ansible/environments/docker-machine/group_vars/all b/ansible/environments/docker-machine/group_vars/all
index 6f68e730f9..14d40945fd 100644
--- a/ansible/environments/docker-machine/group_vars/all
+++ b/ansible/environments/docker-machine/group_vars/all
@@ -5,8 +5,6 @@ docker_registry: ""
 docker_dns: ""
 runtimes_bypass_pull_for_local_images: true
 
-env_hosts_dir: "{{ playbook_dir }}/environments/docker-machine"
-
 # The whisk_api_localhost_name is used to configure nginx to permit vanity URLs for web actions.
 # It is also used for the SSL certificate generation. For a local deployment, this is typically
 # a hostname that is resolved on the client, via /etc/hosts for example.
diff --git a/ansible/environments/local/group_vars/all b/ansible/environments/local/group_vars/all
index b3700ff399..4f34fde3c8 100755
--- a/ansible/environments/local/group_vars/all
+++ b/ansible/environments/local/group_vars/all
@@ -32,5 +32,3 @@ kafka_topics_health_retentionBytes: 104857600
 kafka_topics_health_retentionMS: 300000
 kafka_topics_invoker_retentionBytes: 104857600
 kafka_topics_invoker_retentionMS: 300000
-
-env_hosts_dir: "{{ playbook_dir }}/environments/local"
diff --git a/ansible/group_vars/all b/ansible/group_vars/all
index 936a704f21..939fe52ba8 100644
--- a/ansible/group_vars/all
+++ b/ansible/group_vars/all
@@ -19,7 +19,7 @@ exclude_logs_from: []
 #   whisk_api_localhost_name_default (last)
 whisk_api_localhost_name_default: "localhost"
 
-hosts_dir: "{{ inventory_dir| default(env_hosts_dir) }}"
+hosts_dir: "{{ inventory_dir if inventory_dir else (ansible_inventory_sources[0] | dirname) }}"
 
 whisk:
   version:
@@ -323,4 +323,3 @@ metrics:
     tags: "{{ metrics_kamon_tags | default(false) }}"
     host: "{{ metrics_kamon_statsd_host | default('') }}"
     port: "{{ metrics_kamon_statsd_port | default('8125') }}"
-


 

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services