Merge pull request #2571 from cpennington/devstack-centered-tags

Use devstack as a prefix, rather than a suffix, in tags

.travis.yml

@@ -6,6 +6,7 @@ branches:
 python:
   - "2.7"
 install:
+  - "sudo apt-get update -qq"
   - "sudo apt-get install -y nodejs python-demjson"
   - "pip install --allow-all-external -r requirements.txt"
   - "pip install --allow-all-external demjson"

docker/build/course_discovery/Dockerfile → docker/build/course-discovery/Dockerfile

@@ -2,7 +2,7 @@
 #
 # From the root of configuration:
 #
-# docker build -f docker/build/course_discovery/Dockerfile .
+# docker build -f docker/build/course-discovery/Dockerfile .
 #
 # This allows the dockerfile to update /edx/app/edx_ansible/edx_ansible
 # with the currently checked-out configuration repo.
@@ -18,10 +18,10 @@ ADD . /edx/app/edx_ansible/edx_ansible
 USER docker
 WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
 
-COPY docker/build/course_discovery/ansible_overrides.yml /
+COPY docker/build/course-discovery/ansible_overrides.yml /
 RUN sudo ansible-playbook course_discovery.yml \
     -c local -i '127.0.0.1,' \
-    -t 'install,assets' \
+    -t 'install,assets,devstack:install' \
     --extra-vars="@/ansible_overrides.yml" \
     --extra-vars="COURSE_DISCOVERY_VERSION=$COURSE_DISCOVERY_VERSION" \
     --extra-vars="COMMON_GIT_PATH=$REPO_OWNER"

docker/plays/course_discovery.yml

@@ -6,7 +6,6 @@
     serial_count: 1
   serial: "{{ serial_count }}"
   roles:
-    - docker
     - nginx
     - role: course_discovery
       nginx_default_sites:

playbooks/roles/ansible-role-django-ida/tasks/main.yml

@@ -34,9 +34,9 @@
 - name: update docker templates
   template: src=docker/{{ item.src }} dest=../docker/{{ item.dest }}
   with_items:
-    - { src: 'build/ROLE_NAME/Dockerfile.j2', dest: 'build/{{ role_name }}/Dockerfile'}
-    - { src: 'build/ROLE_NAME/ansible_overrides.yml.j2', dest: 'build/{{ role_name }}/ansible_overrides.yml'}
-    - { src: 'build/ROLE_NAME/inventory', dest: 'build/{{ role_name }}/inventory'}
+    - { src: 'build/ROLE_NAME/Dockerfile.j2', dest: 'build/{{ role_name|replace("_","-") }}/Dockerfile'}
+    - { src: 'build/ROLE_NAME/ansible_overrides.yml.j2', dest: 'build/{{ role_name|replace("_","-") }}/ansible_overrides.yml'}
+    - { src: 'build/ROLE_NAME/inventory', dest: 'build/{{ role_name|replace("_","-") }}/inventory'}
     - { src: 'plays/ROLE_NAME.yml.j2', dest: 'plays/{{ role_name }}.yml'}
 
 - name: update role templates

playbooks/roles/ansible-role-django-ida/templates/docker/build/ROLE_NAME/Dockerfile.j2

@@ -2,7 +2,7 @@
 #
 # From the root of configuration:
 #
-# docker build -f docker/build/{{ role_name }}/Dockerfile .
+# docker build -f docker/build/{{ role_name|replace("_","-") }}/Dockerfile .
 #
 # This allows the dockerfile to update /edx/app/edx_ansible/edx_ansible
 # with the currently checked-out configuration repo.
@@ -18,10 +18,10 @@ ADD . /edx/app/edx_ansible/edx_ansible
 USER docker
 WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
 
-COPY docker/build/{{ role_name }}/ansible_overrides.yml /
+COPY docker/build/{{ role_name|replace("_","-") }}/ansible_overrides.yml /
 RUN sudo ansible-playbook {{ role_name }}.yml \
     -c local -i '127.0.0.1,' \
-    -t 'install,assets' \
+    -t 'install,assets,devstack:install' \
     --extra-vars="@/ansible_overrides.yml" \
     --extra-vars="{{ role_name|upper }}_VERSION=${{ role_name|upper }}_VERSION" \
     --extra-vars="COMMON_GIT_PATH=$REPO_OWNER"

playbooks/roles/ansible-role-django-ida/templates/docker/plays/ROLE_NAME.yml.j2

@@ -6,7 +6,6 @@
     serial_count: 1
   serial: "{{ '{{' }} serial_count }}"
   roles:
-    - docker
     - nginx
     - role: {{ role_name }}
       nginx_default_sites:

playbooks/roles/ansible-role-django-ida/templates/tasks/main.yml.j2

@@ -40,8 +40,8 @@
   sudo_user: "{{ '{{' }} {{ role_name }}_user }}"
   environment: "{{ '{{' }} {{ role_name }}_environment }}"
   tags:
-    - install
-    - install:devstack
+    - devstack
+    - devstack:install
 
 - name: wait for database
   wait_for:
@@ -49,7 +49,8 @@
     port: "{{ '{{' }} {{ role_name|upper }}_DATABASES.default.PORT }}"
     delay: 2
   tags:
-    - migrate:devstack
+    - devstack
+    - devstack:migrate
 
 - name: create databases
   mysql_db:
@@ -60,7 +61,8 @@
     state: present
     encoding: utf8
   tags:
-    - migrate:devstack
+    - devstack
+    - devstack:migrate
 
 - name: create database users
   mysql_user:
@@ -77,7 +79,8 @@
     - name: "{{ '{{' }} COMMON_MYSQL_MIGRATE_USER }}"
       password: "{{ '{{' }} COMMON_MYSQL_MIGRATE_PASS }}"
   tags:
-    - migrate:devstack
+    - devstack
+    - devstack:migrate
 
 - name: migrate database
   command: make migrate
@@ -89,7 +92,8 @@
   tags:
     - migrate
     - migrate:db
-    - migrate:devstack
+    - devstack
+    - devstack:migrate
 
 - name: write out the supervisor wrapper
   template:
@@ -121,7 +125,8 @@
     group: "{{ '{{' }} common_web_user }}"
     mode: 0744
   tags:
-    - install:devstack
+    - devstack
+    - devstack:install
 
 - name: setup the {{ role_name }} env file
   template:
@@ -205,6 +210,7 @@
     owner=root group={{ '{{' }} common_web_user }} mode=0640
   notify: reload nginx
   tags:
+    - install
     - install:vhosts
 
 - name: Creating nginx config links for {{ role_name }}
@@ -214,5 +220,6 @@
     state=link owner=root group=root
   notify: reload nginx
   tags:
+    - install
     - install:vhosts
 

playbooks/roles/ansible-role-django-ida/templates/templates/edx/app/ROLE_NAME/devstack.sh.j2

@@ -12,7 +12,7 @@ case $COMMAND in
 
         cd /edx/app/edx_ansible/edx_ansible/docker/plays
         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="@/ansible_overrides.yml"
 

playbooks/roles/course_discovery/tasks/main.yml

@@ -72,8 +72,8 @@
   sudo_user: "{{ course_discovery_user }}"
   environment: "{{ course_discovery_environment }}"
   tags:
-    - install
-    - install:devstack
+    - devstack
+    - devstack:install
 
 - name: wait for database
   wait_for:
@@ -81,7 +81,8 @@
     port: "{{ COURSE_DISCOVERY_DATABASES.default.PORT }}"
     delay: 2
   tags:
-    - migrate:devstack
+    - devstack
+    - devstack:migrate
 
 - name: create databases
   mysql_db:
@@ -92,7 +93,8 @@
     state: present
     encoding: utf8
   tags:
-    - migrate:devstack
+    - devstack
+    - devstack:migrate
 
 - name: create database users
   mysql_user:
@@ -109,7 +111,8 @@
     - name: "{{ COMMON_MYSQL_MIGRATE_USER }}"
       password: "{{ COMMON_MYSQL_MIGRATE_PASS }}"
   tags:
-    - migrate:devstack
+    - devstack
+    - devstack:migrate
 
 - name: migrate database
   command: make migrate
@@ -121,7 +124,8 @@
   tags:
     - migrate
     - migrate:db
-    - migrate:devstack
+    - devstack
+    - devstack:migrate
 
 - name: write out the supervisor wrapper
   template:
@@ -153,7 +157,8 @@
     group: "{{ common_web_user }}"
     mode: 0744
   tags:
-    - install:devstack
+    - devstack
+    - devstack:install
 
 - name: setup the course_discovery env file
   template:
@@ -237,6 +242,7 @@
     owner=root group={{ common_web_user }} mode=0640
   notify: reload nginx
   tags:
+    - install
     - install:vhosts
 
 - name: Creating nginx config links for course_discovery
@@ -246,5 +252,6 @@
     state=link owner=root group=root
   notify: reload nginx
   tags:
+    - install
     - install:vhosts
 

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

@@ -12,7 +12,7 @@ case $COMMAND in
 
         cd /edx/app/edx_ansible/edx_ansible/docker/plays
         sudo ansible-playbook course_discovery.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="@/ansible_overrides.yml"
 

playbooks/roles/nginx/tasks/main.yml

@@ -273,4 +273,5 @@
   tags:
     - manage
     - manage:start
-    - manage:devstack
+    - devstack
+    - devstack:manage