Updates to db creation playbooks.

- Delete the create_dbs.yml playbook since we don't use it.
- Update the create_db_and_users.yml playbook to use lists instead of dictionaries.

playbooks/edx-east/create_db_and_users.yml

@@ -63,7 +63,7 @@
         login_host={{ item.value.login_host }}
         login_user={{ item.value.login_user }}
         login_password={{ item.value.login_password }}
-      with_dict: databases
+      with_items: databases
       tags:
         - dbs
 
@@ -77,6 +77,6 @@
         login_user={{ item.value.login_user }}
         login_password={{ item.value.login_password }}
         append_privs=yes
-      with_dict: database_users
+      with_items: database_users
       tags:
-        - users
+        - users
\ No newline at end of file

playbooks/edx-east/create_dbs.yml

-# This is a utility play to initialize the mysql dbs for the following
-# roles:
-#   - edxapp
-#   - xqueue
-#   - ora
-#   - discern
-#
-# The mysql root user MUST be passed in as extra vars for
-# at least one of the databases.
-#
-# the environment and deployment must be passed in as COMMON_ENVIRONMENT
-# and COMMON_DEPLOYMENT.  These two vars should be set in the secret
-# var file for the corresponding vpc stack
-#
-# Example invocation:
-#
-# Create the databases for edxapp and xqueue:
-#
-# ansible-playbook -i localhost, create_db_users.yml -e@/path/to/secrets.yml -e "edxapp_db_root_user=root xqueue_db_root_user=root"
-#
-#
-- name: Create all databases on the edX stack
-  hosts: all
-  gather_facts: False
-  vars:
-    # These should be set to the root user for the
-    # db, if left 'None' the databse will be skipped
-    edxapp_db_root_user: 'None'
-    xqueue_db_root_user: 'None'
-    ora_db_root_user: 'None'
-    discern_db_root_user: 'None'
-
-  tasks:
-    - fail: msg="COMMON_ENVIRONMENT and COMMON_DEPLOYMENT need to be defined to use this play"
-      when: COMMON_ENVIRONMENT is not defined or COMMON_DEPLOYMENT is not defined
-    - fail: msg="db_root_pass is not defined"
-      when: db_root_pass is not defined
-    - name: install python mysqldb module
-      apt: pkg={{item}} install_recommends=no state=present update_cache=yes
-      sudo: yes
-      with_items:
-        - python-mysqldb
-      # When this is run on jenkins the package will already
-      # exist and can't run as the jenkins user because it
-      # does not have sudo privs.
-      when: ansible_ssh_user != 'jenkins'
-    - name: create mysql databases for the edX stack
-      mysql_db: >
-        db={{ item[0] }}{{ item[1].db_name }}
-        state=present
-        login_host={{ item[1].db_host }}
-        login_user={{ item[1].db_user }}
-        login_password={{ item[1].db_pass }}
-        encoding=utf8
-      when: item[1].db_user != 'None'
-      with_nested:
-        - ['{{ COMMON_ENVIRONMENT }}_{{ COMMON_DEPLOYMENT }}_test_', '']
-        -
-          # These defaults are needed, otherwise ansible will throw
-          # variable undefined errors for when they are not defined
-          # in secret vars
-          - db_name: "{{ EDXAPP_MYSQL_DB_NAME|default('None') }}"
-            db_host: "{{ EDXAPP_MYSQL_HOST|default('None') }}"
-            db_user: "{{ edxapp_db_root_user }}"
-            db_pass: "{{ db_root_pass }}"
-          - db_name: "{{ XQUEUE_MYSQL_DB_NAME|default('None') }}"
-            db_host: "{{ XQUEUE_MYSQL_HOST|default('None') }}"
-            db_user: "{{ xqueue_db_root_user }}"
-            db_pass: "{{ db_root_pass }}"
-          - db_name: "{{ ORA_MYSQL_DB_NAME|default('None') }}"
-            db_host: "{{ ORA_MYSQL_HOST|default('None') }}"
-            db_user: "{{ ora_db_root_user }}"
-            db_pass: "{{ db_root_pass }}"
-
-
-    - name: assign mysql user permissions for read_only user
-      mysql_user:
-        name: "{{ COMMON_MYSQL_READ_ONLY_USER }}"
-        priv: "*.*:SELECT"
-        password: "{{ COMMON_MYSQL_READ_ONLY_PASS }}"
-        login_host: "{{ item.db_host }}"
-        login_user: "{{ item.db_user }}"
-        login_password: "{{ item.db_pass }}"
-        append_privs: yes
-        host: '%'
-      when: item.db_user != 'None'
-      with_items:
-        - db_host: "{{ EDXAPP_MYSQL_HOST|default('None') }}"
-          db_name: "{{ EDXAPP_MYSQL_DB_NAME|default('None') }}"
-          db_user: "{{ edxapp_db_root_user }}"
-          db_pass: "{{ db_root_pass }}"
-        - db_host: "{{ XQUEUE_MYSQL_HOST|default('None') }}"
-          db_name: "{{ XQUEUE_MYSQL_DB_NAME|default('None') }}"
-          db_user: "{{ xqueue_db_root_user }}"
-          db_pass: "{{ db_root_pass }}"
-        - db_host: "{{ ORA_MYSQL_HOST|default('None') }}"
-          db_name: "{{ ORA_MYSQL_DB_NAME|default('None') }}"
-          db_user: "{{ ora_db_root_user }}"
-          db_pass: "{{ db_root_pass }}"
-
-    - name: assign mysql user permissions for migrate user
-      mysql_user:
-        name: "{{ COMMON_MYSQL_MIGRATE_USER }}"
-        priv: "{{ item.db_name }}.*:SELECT,INSERT,UPDATE,DELETE,ALTER,CREATE,DROP,INDEX"
-        password: "{{ COMMON_MYSQL_MIGRATE_PASS }}"
-        login_host: "{{ item.db_host }}"
-        login_user: "{{ item.db_user }}"
-        login_password: "{{ item.db_pass }}"
-        append_privs: yes
-        host: '%'
-      when: item.db_user != 'None'
-      with_items:
-        - db_host: "{{ EDXAPP_MYSQL_HOST|default('None') }}"
-          db_name: "{{ EDXAPP_MYSQL_DB_NAME|default('None') }}"
-          db_user: "{{ edxapp_db_root_user }}"
-          db_pass: "{{ db_root_pass }}"
-        - db_host: "{{ XQUEUE_MYSQL_HOST|default('None') }}"
-          db_name: "{{ XQUEUE_MYSQL_DB_NAME|default('None') }}"
-          db_user: "{{ xqueue_db_root_user }}"
-          db_pass: "{{ db_root_pass }}"
-        - db_host: "{{ ORA_MYSQL_HOST|default('None') }}"
-          db_name: "{{ ORA_MYSQL_DB_NAME|default('None') }}"
-          db_user: "{{ ora_db_root_user }}"
-          db_pass: "{{ db_root_pass }}"
-
-
-    - name: assign mysql user permissions for admin user
-      mysql_user:
-        name: "{{ COMMON_MYSQL_ADMIN_USER }}"
-        priv: "*.*:CREATE USER"
-        password: "{{ COMMON_MYSQL_ADMIN_PASS }}"
-        login_host: "{{ item.db_host }}"
-        login_user: "{{ item.db_user }}"
-        login_password: "{{ item.db_pass }}"
-        append_privs: yes
-        host: '%'
-      when: item.db_user != 'None'
-      with_items:
-        - db_host: "{{ EDXAPP_MYSQL_HOST|default('None') }}"
-          db_user: "{{ edxapp_db_root_user }}"
-          db_pass: "{{ db_root_pass }}"
-        - db_host: "{{ XQUEUE_MYSQL_HOST|default('None') }}"
-          db_user: "{{ xqueue_db_root_user }}"
-          db_pass: "{{ db_root_pass }}"
-        - db_host: "{{ ORA_MYSQL_HOST|default('None') }}"
-          db_user: "{{ ora_db_root_user }}"
-          db_pass: "{{ db_root_pass }}"
-
-    - name: assign mysql user permissions for db users
-      mysql_user:
-        name: "{{ item.db_user_to_modify }}"
-        priv: "{{ item.db_name }}.*:SELECT,INSERT,UPDATE,DELETE"
-        password: "{{ item.db_user_to_modify_pass }}"
-        login_host: "{{ item.db_host }}"
-        login_user: "{{ item.db_user }}"
-        login_password: "{{ item.db_pass }}"
-        host: '%'
-      when: item.db_user != 'None'
-      with_items:
-        # These defaults are needed, otherwise ansible will throw
-        # variable undefined errors for when they are not defined
-        # in secret vars
-        - db_name: "{{ EDXAPP_MYSQL_DB_NAME|default('None') }}"
-          db_host: "{{ EDXAPP_MYSQL_HOST|default('None') }}"
-          db_user: "{{ edxapp_db_root_user|default('None') }}"
-          db_pass: "{{ db_root_pass|default('None') }}"
-          db_user_to_modify: "{{ EDXAPP_MYSQL_USER }}"
-          db_user_to_modify_pass: "{{ EDXAPP_MYSQL_PASSWORD }}"
-        - db_name: "{{ XQUEUE_MYSQL_DB_NAME|default('None') }}"
-          db_host: "{{ XQUEUE_MYSQL_HOST|default('None') }}"
-          db_user: "{{ xqueue_db_root_user|default('None') }}"
-          db_pass: "{{ db_root_pass|default('None') }}"
-          db_user_to_modify: "{{ XQUEUE_MYSQL_USER }}"
-          db_user_to_modify_pass: "{{ XQUEUE_MYSQL_PASSWORD }}"
-        - db_name: "{{ ORA_MYSQL_DB_NAME|default('None') }}"
-          db_host: "{{ ORA_MYSQL_HOST|default('None') }}"
-          db_user: "{{ ora_db_root_user|default('None') }}"
-          db_pass: "{{ db_root_pass|default('None') }}"
-          db_user_to_modify: "{{ ORA_MYSQL_USER }}"
-          db_user_to_modify_pass: "{{ ORA_MYSQL_PASSWORD }}"
-
-
-    # The second call to mysql_user needs to have append_privs set to
-    # yes otherwise it will overwrite the previous run.
-    # This means that both tasks will report changed on every ansible
-    # run
-
-    - name: assign mysql user permissions for db test user
-      mysql_user:
-        append_privs: yes
-        name: "{{ item.db_user_to_modify }}"
-        priv: "{{ COMMON_ENVIRONMENT }}_{{ COMMON_DEPLOYMENT }}_test_{{ item.db_name }}.*:ALL"
-        password: "{{ item.db_user_to_modify_pass }}"
-        login_host: "{{ item.db_host }}"
-        login_user: "{{ item.db_user }}"
-        login_password: "{{ item.db_pass }}"
-        host: '%'
-      when: item.db_user != 'None'
-      with_items:
-        # These defaults are needed, otherwise ansible will throw
-        # variable undefined errors for when they are not defined
-        # in secret vars
-        - db_name: "{{ EDXAPP_MYSQL_DB_NAME|default('None') }}"
-          db_host: "{{ EDXAPP_MYSQL_HOST|default('None') }}"
-          db_user: "{{ edxapp_db_root_user|default('None') }}"
-          db_pass: "{{ db_root_pass|default('None') }}"
-          db_user_to_modify: "{{ EDXAPP_MYSQL_USER }}"
-          db_user_to_modify_pass: "{{ EDXAPP_MYSQL_PASSWORD }}"
-        - db_name: "{{ XQUEUE_MYSQL_DB_NAME|default('None') }}"
-          db_host: "{{ XQUEUE_MYSQL_HOST|default('None') }}"
-          db_user: "{{ xqueue_db_root_user|default('None') }}"
-          db_pass: "{{ db_root_pass|default('None') }}"
-          db_user_to_modify: "{{ XQUEUE_MYSQL_USER }}"
-          db_user_to_modify_pass: "{{ XQUEUE_MYSQL_PASSWORD }}"
-        - db_name: "{{ ORA_MYSQL_DB_NAME|default('None') }}"
-          db_host: "{{ ORA_MYSQL_HOST|default('None') }}"
-          db_user: "{{ ora_db_root_user|default('None') }}"
-          db_pass: "{{ db_root_pass|default('None') }}"
-          db_user_to_modify: "{{ ORA_MYSQL_USER }}"
-          db_user_to_modify_pass: "{{ ORA_MYSQL_PASSWORD }}"