Make aws and openstack roles create their own directories.

The vhost role used to create directories required by the aws and
openstack roles based on the value of the VHOST_NAME variable, but that
turned out to be problematic (see https://github.com/edx/configuration/pull/3519).

Remove the VHOST_NAME variable and make each aws and openstack role
responsible for creating its own directories.

playbooks/roles/aws/defaults/main.yml

@@ -11,14 +11,6 @@
 # Defaults for role 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.
 # This relies on your server being able to send mail
@@ -29,8 +21,22 @@ AWS_S3_LOGS_FROM_EMAIL: dummy@example.com
 AWS_S3_LOGS_ACCESS_KEY_ID: ""
 AWS_S3_LOGS_SECRET_KEY: ""
 
-aws_s3_sync_script: "{{ vhost_dirs.home.path }}/send-logs-to-s3"
-aws_s3_logfile: "{{ vhost_dirs.logs.path }}/s3-log-sync.log"
+aws_role_name: aws
+
+aws_dirs:
+  home:
+    path: "{{ COMMON_APP_DIR }}/{{ aws_role_name }}"
+    owner: "root"
+    group: "root"
+    mode: "0755"
+  logs:
+    path: "{{ COMMON_LOG_DIR }}/{{ aws_role_name }}"
+    owner: "syslog"
+    group: "syslog"
+    mode: "0650"
+
+aws_s3_sync_script: "{{ aws_dirs.home.path }}/send-logs-to-s3"
+aws_s3_logfile: "{{ aws_dirs.logs.path }}/s3-log-sync.log"
 aws_region: "us-east-1"
 # default path to the aws binary
 aws_s3cmd: "/usr/local/bin/s3cmd"

playbooks/roles/aws/meta/main.yml

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

playbooks/roles/aws/tasks/main.yml

@@ -67,6 +67,15 @@
     extra_args: "-i {{ COMMON_PYPI_MIRROR_URL }}"
   with_items: "{{ aws_pip_pkgs }}"
 
+- name: Create required directories
+  file:
+    path: "{{ item.value.path }}"
+    state: directory
+    owner: "{{ item.value.owner }}"
+    group: "{{ item.value.group }}"
+    mode: "{{ item.value.mode }}"
+  with_dict: "{{ aws_dirs }}"
+
 - name: Create s3 log sync script
   template:
     dest: "{{ aws_s3_sync_script }}"

playbooks/roles/openstack/defaults/main.yml

@@ -11,14 +11,6 @@
 # Defaults for role 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: ''
 SWIFT_LOG_SYNC_PASSWORD: ''
@@ -27,11 +19,25 @@ SWIFT_LOG_SYNC_TENANT_NAME: ''
 SWIFT_LOG_SYNC_AUTH_URL: ''
 SWIFT_LOG_SYNC_REGION_NAME: ''
 
+openstack_role_name: openstack
+
+openstack_dirs:
+  home:
+    path: "{{ COMMON_APP_DIR }}/{{ openstack_role_name }}"
+    owner: "root"
+    group: "root"
+    mode: "0755"
+  logs:
+    path: "{{ COMMON_LOG_DIR }}/{{ openstack_role_name }}"
+    owner: "syslog"
+    group: "syslog"
+    mode: "0650"
+
 openstack_requirements_file: "{{ edxapp_code_dir }}/requirements/edx/openstack.txt"
 
-openstack_log_sync_script: "{{ vhost_dirs.home.path }}/send-logs-to-swift"
-openstack_log_sync_script_environment: "{{ vhost_dirs.home.path }}/log-sync-env.sh"
-openstack_swift_logfile: "{{ vhost_dirs.logs.path }}/log-sync.log"
+openstack_log_sync_script: "{{ openstack_dirs.home.path }}/send-logs-to-swift"
+openstack_log_sync_script_environment: "{{ openstack_dirs.home.path }}/log-sync-env.sh"
+openstack_swift_logfile: "{{ openstack_dirs.logs.path }}/log-sync.log"
 
 openstack_debian_pkgs:
   - python-setuptools

playbooks/roles/openstack/meta/main.yml

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

playbooks/roles/openstack/tasks/main.yml

@@ -25,6 +25,15 @@
     extra_args: "-i {{ COMMON_PYPI_MIRROR_URL }}"
   with_items: "{{ openstack_pip_pkgs }}"
 
+- name: Create required directories
+  file:
+    path: "{{ item.value.path }}"
+    state: directory
+    owner: "{{ item.value.owner }}"
+    group: "{{ item.value.group }}"
+    mode: "{{ item.value.mode }}"
+  with_dict: "{{ openstack_dirs }}"
+
 - name: Create log sync script
   template:
     src: send-logs-to-swift.j2

playbooks/roles/vhost/defaults/main.yml

----
-#
-# edX Configuration
-#
-# github:     https://github.com/edx/configuration
-# wiki:       https://openedx.atlassian.net/wiki/display/OpenOPS
-# code style: https://openedx.atlassian.net/wiki/display/OpenOPS/Ansible+Code+Conventions
-# license:    https://github.com/edx/configuration/blob/master/LICENSE.TXT
-#
-##
-# Defaults for role vhost
-# 
-
-# Specify a name for vhost deployments, e.g. aws or openstack. Service files
-# specific to the vhost will be namespaced in directories with this name.
-VHOST_NAME: 'vhost'
-
-vhost_dirs:
-  home:
-    path: "{{ COMMON_APP_DIR }}/{{ VHOST_NAME }}"
-    owner: "root"
-    group: "root"
-    mode: "0755"
-  logs:
-    path: "{{ COMMON_LOG_DIR }}/{{ VHOST_NAME }}"
-    owner: "syslog"
-    group: "syslog"
-    mode: "0650"
-  data:
-    path: "{{ COMMON_DATA_DIR }}/{{ VHOST_NAME }}"
-    owner: "root"
-    group: "root"
-    mode: "0700"

playbooks/roles/vhost/tasks/main.yml

@@ -22,15 +22,6 @@
 # - common
 #
 
-- name: Create all service directories
-  file:
-    path: "{{ item.value.path }}"
-    state: directory
-    owner: "{{ item.value.owner }}"
-    group: "{{ item.value.group }}"
-    mode: "{{ item.value.mode }}"
-  with_dict: "{{ vhost_dirs }}"
-
 - name: Force logrotate on supervisor stop
   template:
     src: etc/init/sync-on-stop.conf.j2