Merge pull request #3236 from edx/e0d/alternate-solution-to-aws-issue

Passing the var

playbooks/roles/aws/defaults/main.yml

@@ -11,7 +11,13 @@
 # Defaults for role aws
 #
 
-VHOST_NAME: aws
+# Both of these vars are required to work-around
+# some ansible variable precedence issues with
+# circular dependencies introduced in the openstack PR.
+# More investigation is required to determine the optimal
+# solution.
+vhost_name: aws
+VHOST_NAME: "{{ vhost_name }}"
 
 # If there are any issues with the s3 sync an error
 # log will be sent to the following address.

playbooks/roles/aws/meta/main.yml

@@ -11,4 +11,5 @@
 # Role includes for role aws
 # 
 dependencies:
-  - vhost
+  - role: vhost
+    VHOST_NAME: "{{ vhost_name }}"

playbooks/roles/openstack/defaults/main.yml

@@ -11,7 +11,13 @@
 # Defaults for role openstack
 #
 
-VHOST_NAME: openstack
+# Both of these vars are required to work-around
+# some ansible variable precedence issues with
+# circular dependencies introduced in the openstack PR.
+# More investigation is required to determine the optimal
+# solution.
+vhost_name: openstack
+VHOST_NAME: "{{ vhost_name }}"
 
 # Credentials for log sync script
 SWIFT_LOG_SYNC_USERNAME: ''

playbooks/roles/openstack/meta/main.yml

@@ -11,4 +11,5 @@
 # Role includes for role openstack
 #
 dependencies:
-  - vhost
+  - role: vhost
+    VHOST_NAME: "{{ vhost_name }}"