Merge pull request #4562 from edx/jibsheet/oh-edx-service

Cleaning up /edx/etc/app (vs /edx/etc/app.yml)

playbooks/roles/edx_service/tasks/main.yml

@@ -43,12 +43,7 @@
 #       debian: [ pkg1, pkg2, pkg3 ]
 #       redhat: [ pkg4, pkg5 ]
 #
-# Assumes that the home directory has been created above.
-# In some cases(vagrant boxes) the home directory gets created
-# but does not have the corrent owner and group. In vagrant for
-# example we were seeing it defaulting to `root` for both.
-# The item that is a blank string("") ensures the ownership
-# of the home directory is always correct before proceeding.
+
 - name: Create edx_service app, venv, data, and staticfiles dirs
   file:
     path: "{{ edx_service_home }}/{{ item }}"
@@ -64,16 +59,24 @@
     - install
     - install:base
 
-- name: Create /edx/var and /edx/etc dirs
+- name: Create /edx/var/app dir
   file:
-    path: "{{ item }}/{{ edx_service_name }}"
+    path: "/edx/var/{{ edx_service_name }}"
+    state: directory
+    owner: "{{ edx_service_user }}"
+    group: "{{ common_web_group }}"
+    mode: "0755"
+  tags:
+    - install
+    - install:base
+
+- name: Create /edx/etc dir
+  file:
+    path: "/edx/etc"
     state: directory
     owner: "{{ edx_service_user }}"
     group: "{{ common_web_group }}"
     mode: "0755"
-  with_items:
-    - "/edx/var"
-    - "/edx/etc"
   tags:
     - install
     - install:base

playbooks/roles/edxapp/defaults/main.yml

@@ -618,7 +618,7 @@ EDXAPP_OAUTH_EXPIRE_PUBLIC_CLIENT_DAYS: 30
 # This turns on deletion of access tokens, refresh tokens, and grants when consumed (not bulk deletions)
 EDXAPP_OAUTH_DELETE_EXPIRED: True
 
-# Directory for edxapp application configuration files
+# Unused directory for edxapp application yaml configuration files
 EDXAPP_CFG_DIR: "{{ COMMON_CFG_DIR }}/edxapp"
 EDXAPP_DEPRECATED_ADVANCED_COMPONENT_TYPES: []
 

playbooks/roles/edxapp/tasks/deploy.yml

 ---
-- name: create edxapp configuration dir
-  file:
-    path: "{{ EDXAPP_CFG_DIR }}"
-    state: directory
-    owner: "{{ edxapp_user }}"
-    group: "{{ common_web_group }}"
-  tags:
-    - install
-    - install:base
-
 - name: copy the template to the desired location
   template:
     src: "{{ item.src }}"

tests/test_edx_east_roles.sh

@@ -16,7 +16,7 @@ ansible-playbook -i localhost, --syntax-check travis-test.yml
 
 output_dir="$PWD/test_output/env-dep"
 mkdir -p $output_dir
-ansible-playbook -i localhost, -c local --tags edxapp_cfg edxapp.yml -e edxapp_user=`whoami` -e edxapp_app_dir=$output_dir -e edxapp_code_dir=$output_dir -e EDXAPP_CFG_DIR=$output_dir
+ansible-playbook -i localhost, -c local --tags edxapp_cfg edxapp.yml -e edxapp_user=`whoami` -e edxapp_app_dir=$output_dir -e edxapp_code_dir=$output_dir
 
 root_dir=$output_dir
 environment_deployments="."

util/baked_config.sh

@@ -24,4 +24,4 @@ fi
 mkdir -p $WORKSPACE/baked-config-secure/${E_D}
 
 cd ../playbooks/edx-east/
-ansible-playbook -vvv -c local -i 'localhost,' --tags edxapp_cfg ./edxapp.yml ${VARS} -e edxapp_user=$(whoami) -e common_web_group=$(whoami) -e edxapp_app_dir=$WORKSPACE/baked-config-secure/${E_D} -e edxapp_code_dir=$WORKSPACE/edx-platform -e EDXAPP_CFG_DIR=$WORKSPACE/baked-config-secure/${E_D} -s --ask-sudo-pass --diff
+ansible-playbook -vvv -c local -i 'localhost,' --tags edxapp_cfg ./edxapp.yml ${VARS} -e edxapp_user=$(whoami) -e common_web_group=$(whoami) -e edxapp_app_dir=$WORKSPACE/baked-config-secure/${E_D} -e edxapp_code_dir=$WORKSPACE/edx-platform -s --ask-sudo-pass --diff