Use a new life-cycle tag 'migrate:install' to install databases and users

docker/build/course-discovery/Dockerfile

@@ -20,7 +20,7 @@ WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
 COPY docker/build/course-discovery/ansible_overrides.yml /
 RUN sudo /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook course_discovery.yml \
     -c local -i '127.0.0.1,' \
-    -t 'install,assets,devstack:install' \
+    -t 'install,assets,devstack,migrate' \
     --extra-vars="@/ansible_overrides.yml" \
     --extra-vars="COURSE_DISCOVERY_VERSION=$COURSE_DISCOVERY_VERSION" \
     --extra-vars="COMMON_GIT_PATH=$REPO_OWNER"

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

@@ -20,7 +20,7 @@ WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
 COPY docker/build/{{ role_name|replace("_","-") }}/ansible_overrides.yml /
 RUN sudo /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook {{ role_name }}.yml \
     -c local -i '127.0.0.1,' \
-    -t 'install,assets,devstack:install' \
+    -t 'install,assets,devstack,migrate' \
     --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/tasks/main.yml.j2

@@ -59,8 +59,8 @@
     port: "{{ '{{' }} {{ role_name|upper }}_DATABASES.default.PORT }}"
     delay: 2
   tags:
-    - devstack
-    - devstack:migrate
+    - migrate
+    - migrate:install
 
 - name: create databases
   mysql_db:
@@ -71,8 +71,8 @@
     state: present
     encoding: utf8
   tags:
-    - devstack
-    - devstack:migrate
+    - migrate
+    - migrate:install
 
 - name: create database users
   mysql_user:
@@ -89,8 +89,8 @@
     - name: "{{ '{{' }} COMMON_MYSQL_MIGRATE_USER }}"
       password: "{{ '{{' }} COMMON_MYSQL_MIGRATE_PASS }}"
   tags:
-    - devstack
-    - devstack:migrate
+    - migrate
+    - migrate:install
 
 - name: migrate database
   command: make migrate
@@ -102,8 +102,6 @@
   tags:
     - migrate
     - migrate:db
-    - devstack
-    - devstack:migrate
 
 - name: write out the supervisor wrapper
   template:

playbooks/roles/course_discovery/tasks/main.yml

@@ -81,8 +81,8 @@
     port: "{{ COURSE_DISCOVERY_DATABASES.default.PORT }}"
     delay: 2
   tags:
-    - devstack
-    - devstack:migrate
+    - migrate
+    - migrate:install
 
 - name: create databases
   mysql_db:
@@ -93,8 +93,8 @@
     state: present
     encoding: utf8
   tags:
-    - devstack
-    - devstack:migrate
+    - migrate
+    - migrate:install
 
 - name: create database users
   mysql_user:
@@ -111,8 +111,8 @@
     - name: "{{ COMMON_MYSQL_MIGRATE_USER }}"
       password: "{{ COMMON_MYSQL_MIGRATE_PASS }}"
   tags:
-    - devstack
-    - devstack:migrate
+    - migrate
+    - migrate:install
 
 - name: migrate database
   command: make migrate
@@ -124,8 +124,6 @@
   tags:
     - migrate
     - migrate:db
-    - devstack
-    - devstack:migrate
 
 - name: write out the supervisor wrapper
   template:

playbooks/roles/credentials/tasks/main.yml

@@ -75,8 +75,8 @@
     port: "{{ CREDENTIALS_DATABASES.default.PORT }}"
     delay: 2
   tags:
-    - devstack
-    - devstack:migrate
+    - migrate
+    - migrate:install
 
 - name: create databases
   mysql_db:
@@ -87,8 +87,8 @@
     state: present
     encoding: utf8
   tags:
-    - devstack
-    - devstack:migrate
+    - migrate
+    - migrate:install
 
 - name: create database users
   mysql_user:
@@ -105,8 +105,8 @@
     - name: "{{ COMMON_MYSQL_MIGRATE_USER }}"
       password: "{{ COMMON_MYSQL_MIGRATE_PASS }}"
   tags:
-    - devstack
-    - devstack:migrate
+    - migrate
+    - migrate:install
 
 - name: migrate database
   command: make migrate
@@ -118,8 +118,6 @@
   tags:
     - migrate
     - migrate:db
-    - devstack
-    - devstack:migrate
 
 - name: write out the supervisor wrapper
   template:

playbooks/roles/nginx/tasks/main.yml

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