Re-run the django-ida template role to pull in some additional changes made to…

Re-run the django-ida template role to pull in some additional changes made to it into the credentials role

docker/build/credentials/Dockerfile

@@ -7,7 +7,7 @@
 # This allows the dockerfile to update /edx/app/edx_ansible/edx_ansible
 # with the currently checked-out configuration repo.
 
-FROM edxops/trusty-common
+FROM edxops/trusty-common:latest
 MAINTAINER edxops
 
 ARG CREDENTIALS_VERSION=master
@@ -18,7 +18,7 @@ ADD . /edx/app/edx_ansible/edx_ansible
 WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
 
 COPY docker/build/credentials/ansible_overrides.yml /
-RUN sudo /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook /edx/app/edx_ansible/edx_ansible/docker/plays/credentials.yml \
+RUN sudo /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook credentials.yml \
     -c local -i '127.0.0.1,' \
     -t 'install,assets,devstack:install' \
     --extra-vars="@/ansible_overrides.yml" \

docker/plays/credentials.yml

@@ -9,4 +9,4 @@
     - nginx
     - role: credentials
       nginx_default_sites:
-        - credentials
+        - credentials
\ No newline at end of file

playbooks/roles/credentials/defaults/main.yml

@@ -80,6 +80,7 @@ CREDENTIALS_SERVICE_CONFIG:
   DATABASE_OPTIONS:
     connect_timeout: 10
   DATABASES: '{{ CREDENTIALS_DATABASES }}'
+  CACHES: '{{ CREDENTIALS_CACHES }}'
 
   PLATFORM_NAME: '{{ CREDENTIALS_PLATFORM_NAME }}'
 

playbooks/roles/credentials/meta/main.yml

@@ -19,6 +19,8 @@
 #   my_role_var1: "bar"
 # }
 dependencies:
+  - common
+  - supervisor
   - role: edx_service
     edx_service_name: "{{ credentials_service_name }}"
     edx_service_config: "{{ CREDENTIALS_SERVICE_CONFIG }}"
@@ -28,4 +30,3 @@ dependencies:
     edx_service_packages:
       debian: "{{ credentials_debian_pkgs }}"
       redhat: "{{ credentials_redhat_pkgs }}"
-  - supervisor

playbooks/roles/credentials/templates/edx/app/credentials/devstack.sh.j2

@@ -11,8 +11,8 @@ case $COMMAND in
         {% set executable = credentials_venv_bin + '/gunicorn' %}
 
         cd /edx/app/edx_ansible/edx_ansible/docker/plays
-        sudo ansible-playbook credentials.yml -c local -i '127.0.0.1,' \
-            -t 'install:app-requirements,assets:gather,devstack:migrate,devstack:manage' \
+        sudo /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook credentials.yml -c local -i '127.0.0.1,' \
+            -t 'install:app-requirements,assets:gather,devstack' \
             --extra-vars="migrate_db=yes" \
             --extra-vars="@/ansible_overrides.yml"
 
@@ -23,7 +23,7 @@ case $COMMAND in
 
         ;;
     open)
-        cd {{ credentials_home }}
+        cd {{ credentials_code_dir }}/
         . {{ credentials_venv_bin }}/activate
         /bin/bash
         ;;