Commit 45a216ba by Calen Pennington

Port devstack changes back to the template role

parent 4aa969bf
...@@ -21,7 +21,7 @@ WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays ...@@ -21,7 +21,7 @@ WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
COPY docker/build/{{ role_name }}/ansible_overrides.yml / COPY docker/build/{{ role_name }}/ansible_overrides.yml /
RUN sudo ansible-playbook {{ role_name }}.yml \ RUN sudo ansible-playbook {{ role_name }}.yml \
-c local -i '127.0.0.1,' \ -c local -i '127.0.0.1,' \
-t 'install,assets' \ -t 'install,assets,devstack:install' \
--extra-vars="@/ansible_overrides.yml" \ --extra-vars="@/ansible_overrides.yml" \
--extra-vars="{{ role_name|upper }}_VERSION=${{ role_name|upper }}_VERSION" \ --extra-vars="{{ role_name|upper }}_VERSION=${{ role_name|upper }}_VERSION" \
--extra-vars="COMMON_GIT_PATH=$REPO_OWNER" --extra-vars="COMMON_GIT_PATH=$REPO_OWNER"
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
serial_count: 1 serial_count: 1
serial: "{{ '{{' }} serial_count }}" serial: "{{ '{{' }} serial_count }}"
roles: roles:
- docker
- nginx - nginx
- role: {{ role_name }} - role: {{ role_name }}
nginx_default_sites: nginx_default_sites:
......
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
sudo_user: "{{ '{{' }} {{ role_name }}_user }}" sudo_user: "{{ '{{' }} {{ role_name }}_user }}"
environment: "{{ '{{' }} {{ role_name }}_environment }}" environment: "{{ '{{' }} {{ role_name }}_environment }}"
tags: tags:
- install
- devstack - devstack
- devstack:install - devstack:install
...@@ -211,6 +210,7 @@ ...@@ -211,6 +210,7 @@
owner=root group={{ '{{' }} common_web_user }} mode=0640 owner=root group={{ '{{' }} common_web_user }} mode=0640
notify: reload nginx notify: reload nginx
tags: tags:
- install
- install:vhosts - install:vhosts
- name: Creating nginx config links for {{ role_name }} - name: Creating nginx config links for {{ role_name }}
...@@ -220,5 +220,6 @@ ...@@ -220,5 +220,6 @@
state=link owner=root group=root state=link owner=root group=root
notify: reload nginx notify: reload nginx
tags: tags:
- install
- install:vhosts - install:vhosts
...@@ -12,7 +12,7 @@ case $COMMAND in ...@@ -12,7 +12,7 @@ case $COMMAND in
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 ansible-playbook {{ role_name }}.yml -c local -i '127.0.0.1,' \
-t 'install:app-requirements,assets:gather,migrate:devstack,manage:devstack' \ -t 'install:app-requirements,assets:gather,devstack:migrate,devstack:manage' \
--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