Better consistency, argument passing

playbooks/roles/aws/defaults/main.yml

@@ -11,7 +11,7 @@
 # Defaults for role aws
 #
 
-VHOST_NAME: aws
+vhost_name: aws
 
 # 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

@@ -12,4 +12,4 @@
 # 
 dependencies:
   - role: vhost
-    VHOST_NAME: "aws"
+    VHOST_NAME: "{{ vhost_name }}"

playbooks/roles/openstack/defaults/main.yml

@@ -11,7 +11,7 @@
 # Defaults for role openstack
 #
 
-VHOST_NAME: openstack
+vhost_name: openstack
 
 # 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 }}"