Commit 9789df89 by Calen Pennington

Update the django IDA template to match the latest Docker changes

parent 69813d45
...@@ -7,19 +7,18 @@ ...@@ -7,19 +7,18 @@
# This allows the dockerfile to update /edx/app/edx_ansible/edx_ansible # This allows the dockerfile to update /edx/app/edx_ansible/edx_ansible
# with the currently checked-out configuration repo. # with the currently checked-out configuration repo.
FROM edxops/trusty-common FROM edxops/trusty-common:latest
MAINTAINER edxops MAINTAINER edxops
ARG {{ role_name|upper }}_VERSION=master ENV {{ role_name|upper }}_VERSION=master
ARG REPO_OWNER=edx ENV REPO_OWNER=edx
ADD . /edx/app/edx_ansible/edx_ansible ADD . /edx/app/edx_ansible/edx_ansible
USER docker
WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
COPY docker/build/{{ role_name|replace("_","-") }}/ansible_overrides.yml / COPY docker/build/{{ role_name|replace("_","-") }}/ansible_overrides.yml /
RUN sudo ansible-playbook {{ role_name }}.yml \ RUN sudo /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook {{ role_name }}.yml \
-c local -i '127.0.0.1,' \ -c local -i '127.0.0.1,' \
-t 'install,assets,devstack:install' \ -t 'install,assets,devstack:install' \
--extra-vars="@/ansible_overrides.yml" \ --extra-vars="@/ansible_overrides.yml" \
......
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
# my_role_var1: "bar" # my_role_var1: "bar"
# } # }
dependencies: dependencies:
- common
- supervisor
- role: edx_service - role: edx_service
edx_service_name: "{{ '{{' }} {{ role_name }}_service_name }}" edx_service_name: "{{ '{{' }} {{ role_name }}_service_name }}"
edx_service_config: "{{ '{{' }} {{ role_name|upper }}_SERVICE_CONFIG }}" edx_service_config: "{{ '{{' }} {{ role_name|upper }}_SERVICE_CONFIG }}"
...@@ -21,4 +23,3 @@ dependencies: ...@@ -21,4 +23,3 @@ dependencies:
edx_service_packages: edx_service_packages:
debian: "{{ '{{' }} {{ role_name }}_debian_pkgs }}" debian: "{{ '{{' }} {{ role_name }}_debian_pkgs }}"
redhat: "{{ '{{' }} {{ role_name }}_redhat_pkgs }}" redhat: "{{ '{{' }} {{ role_name }}_redhat_pkgs }}"
- supervisor
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