Commit 93cfff8d by Calen Pennington Committed by zubair-arbi

Back-port fixes to the django-ida role template

parent b7f61836
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
FROM edxops/trusty-common:latest FROM edxops/trusty-common:latest
MAINTAINER edxops MAINTAINER edxops
ENV {{ role_name|upper }}_VERSION=master ARG {{ role_name|upper }}_VERSION=master
ENV REPO_OWNER=edx ARG REPO_OWNER=edx
ADD . /edx/app/edx_ansible/edx_ansible ADD . /edx/app/edx_ansible/edx_ansible
......
...@@ -23,6 +23,16 @@ ...@@ -23,6 +23,16 @@
- install - install
- install:configuration - install:configuration
- name: build virtualenv
command: "virtualenv {{ '{{' }} {{ role_name }}_venv_dir }}"
args:
creates: "{{ '{{' }} {{ role_name }}_venv_dir }}/bin/pip"
sudo_user: "{{ '{{' }} {{ role_name }}_user }}"
environment: "{{ '{{' }} {{ role_name }}_environment }}"
tags:
- install
- install:app-requirements
- name: install application requirements - name: install application requirements
command: make requirements command: make requirements
args: args:
......
...@@ -11,7 +11,7 @@ case $COMMAND in ...@@ -11,7 +11,7 @@ case $COMMAND in
{{ '{%' }} set executable = {{ role_name }}_venv_bin + '/gunicorn' %} {{ '{%' }} set executable = {{ role_name }}_venv_bin + '/gunicorn' %}
cd /edx/app/edx_ansible/edx_ansible/docker/plays cd /edx/app/edx_ansible/edx_ansible/docker/plays
sudo ansible-playbook {{ role_name }}.yml -c local -i '127.0.0.1,' \ sudo /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook {{ role_name }}.yml -c local -i '127.0.0.1,' \
-t 'install:app-requirements,assets:gather,devstack' \ -t 'install:app-requirements,assets:gather,devstack' \
--extra-vars="migrate_db=yes" \ --extra-vars="migrate_db=yes" \
--extra-vars="@/ansible_overrides.yml" --extra-vars="@/ansible_overrides.yml"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment