changes to make 3-27 install work

playbooks/edx-west/carnegie-prod-worker.yml

@@ -41,7 +41,6 @@
     - role: 'edxapp'
       celery_worker: True
       devstack: false
-      tags: celery
     - role: nginx
       nginx_sites:
       - xqueue

playbooks/edx-west/cme-prod-worker.yml

@@ -43,7 +43,6 @@
     - role: 'edxapp'
       celery_worker: True
       devstack: false
-      tags: celery
     - role: nginx
       nginx_sites:
       - xqueue

playbooks/edx-west/prod-worker.yml

@@ -37,25 +37,23 @@
         - jinpa
         - gbruhns
       tags: users
-    - role: 'common'
-      tags: common
-    - role: 'supervisor'
-      tags: supervisor
-    - role: 'edxapp'
+    - common
+    - supervisor
+    - role: edxapp
       celery_worker: True
       devstack: false
-      tags: celery
     - role: nginx
       nginx_sites:
-      - xqueue
-      - basic-auth
-      tags: nginx
+        - xqueue
+        - basic-auth
+      tags:
+        - nginx
     - role: xqueue
       xqueue_create_db: "no"
       xqueue_create_users: false
-      tags: xqueue
+      tags:
+        - xqueue
     - datadog
-    #- splunkforwarder
 
 - name: run the certificate agent on the first util machine only
   hosts: ~tag_Name_util1_prod

playbooks/edx-west/stage-app.yml

@@ -44,6 +44,7 @@
         - lms
     - role: edxapp
       devstack: false
+      tags: edxapp
     - apache
     - shibboleth
     #- datadog

playbooks/edx-west/stage-worker.yml

@@ -42,7 +42,6 @@
     - role: edxapp
       celery_worker: True
       devstack: false
-      tags: celery
     - role: nginx
       nginx_sites:
       - xqueue

playbooks/roles/apache/tasks/main.yml

@@ -28,7 +28,7 @@
 - name: Register the fact that apache role has run
   command: echo True
   register: apache_role_run
-  notify: apache | restart apache
+  notify: restart apache
   tags:
     - apache
     - install

playbooks/roles/certs/tasks/main.yml

@@ -54,7 +54,13 @@
     - "{{ certs_app_dir }}"
     - "{{ certs_venvs_dir }}"
 
-- name: create certs gpg dir
+- name: destroy certs gpg dir
+  file: >
+    path="{{ certs_gpg_dir }}" state=absent
+    recurse="yes"
+  notify: restart certs
+
+- name: recreate certs gpg dir
   file: >
     path="{{ certs_gpg_dir }}" state=directory
     owner="{{ common_web_user }}"
@@ -64,17 +70,25 @@
 - name: copy the private gpg signing key
   copy: >
     src={{ CERTS_LOCAL_PRIVATE_KEY }}
-    dest={{ certs_app_dir }}/{{ CERTS_LOCAL_PRIVATE_KEY|basename }}
+    dest={{ certs_gpg_dir }}/{{ CERTS_LOCAL_PRIVATE_KEY|basename }}
     owner={{ common_web_user }} mode=0600
   notify: restart certs
   register: certs_gpg_key
 
+- name: change owner of gpg dir
+  file: >
+    path="{{ certs_gpg_dir }}" state=directory
+    owner="{{ common_web_user }}" group="{{ common_web_group }}"
+    recurse="yes"
+    mode=0700
+  notify: restart certs
+
 
 - name: load the gpg key
   shell: >
-    /usr/bin/gpg --homedir {{ certs_gpg_dir }} --import {{ certs_app_dir }}/{{ CERTS_LOCAL_PRIVATE_KEY|basename }}
+    /usr/bin/gpg --homedir {{ certs_gpg_dir }} --import {{ certs_gpg_dir }}/{{ CERTS_LOCAL_PRIVATE_KEY|basename }}
   sudo_user: "{{ common_web_user }}"
   when: certs_gpg_key.changed
   notify: restart certs
 
-- include: deploy.yml tags=deploy
+- include: deploy.yml tags=deploy,certs

playbooks/roles/datadog/tasks/main.yml

@@ -53,7 +53,7 @@
     dest=/usr/share/datadog/agent/nginx_log_http_response_counter.py
     owner=root group=root mode=0644
   notify:
-    - datadog | restart the datadog service
+    - restart the datadog service
   tags:
     - datadog
 
@@ -70,7 +70,7 @@
 - name: datadog | enable nginx module
   template: dest=/etc/dd-agent/conf.d/nginx.yaml src=nginx.yaml.j2 owner=root group=root mode=0644
   notify:
-    - datadog | restart the datadog service
+    - restart the datadog service
   tags:
     - datadog
 
@@ -91,7 +91,7 @@
     state=present 
     "regexp=^\s*#?\s*hostname\s*:.+$"
   notify:
-    - datadog | restart the datadog service
+    - restart the datadog service
   tags:
     - datadog
 
@@ -102,7 +102,7 @@
     state=present 
     "regexp=^\s*#?\s*dogstatsd_interval\s*:.+$"
   notify:
-    - datadog | restart the datadog service
+    - restart the datadog service
   tags:
     - datadog
 
@@ -113,7 +113,7 @@
     state=present 
     regexp='^\s*#?\s*dogstreams\s*:.+$'
   notify:
-    - datadog | restart the datadog service
+    - restart the datadog service
   tags:
     - datadog
 

playbooks/roles/edxapp/defaults/main.yml

@@ -510,6 +510,8 @@ edxapp_debian_pkgs:
   # Needed by the CMS to manipulate images.
   - libjpeg8-dev
   - libpng12-dev
+  # Postgres support
+  - libpq-dev
 
 # Ruby Specific Vars
 edxapp_ruby_version: "1.9.3-p374"