Merge pull request #864 from edx/cg/add_migration_user

Added option to specify migration user and changed to admin user and password vars

playbooks/roles/edxapp/defaults/main.yml

@@ -31,9 +31,12 @@ EDXAPP_MONGO_DB_NAME: 'edxapp'
 
 EDXAPP_MYSQL_DB_NAME: 'edxapp'
 EDXAPP_MYSQL_USER: 'edxapp001'
+EDXAPP_MYSQL_USER_ADMIN: 'root'
+EDXAPP_MYSQL_USER_MIGRATE: 'root'
 EDXAPP_MYSQL_PASSWORD: 'password'
 EDXAPP_MYSQL_PASSWORD_READ_ONLY: 'password'
 EDXAPP_MYSQL_PASSWORD_ADMIN: 'password'
+EDXAPP_MYSQL_PASSWORD_MIGRATE: 'password'
 
 EDXAPP_MYSQL_HOST: 'localhost'
 EDXAPP_MYSQL_PORT: '3306'

playbooks/roles/edxapp/tasks/service_variant_config.yml

@@ -97,7 +97,8 @@
     {{ edxapp_venv_bin}}/python manage.py lms syncdb --migrate --noinput --settings=aws_migrate
   when: fake_migrations is not defined and migrate_db is defined and migrate_db|lower == "yes"
   environment:
-    DB_MIGRATION_PASS: "{{ EDXAPP_MYSQL_PASSWORD }}"
+    DB_MIGRATION_USER: "{{ EDXAPP_MYSQL_USER_MIGRATE }}"
+    DB_MIGRATION_PASS: "{{ EDXAPP_MYSQL_PASSWORD_MIGRATE }}"
   sudo_user: "{{ edxapp_user }}"
   notify:
   - "restart edxapp"
@@ -126,6 +127,9 @@
     chdir={{ edxapp_code_dir }}
     {{ edxapp_venv_bin}}/python manage.py lms migrate --noinput --settings=aws_migrate
   when: fake_migrations is not defined and migrate_only is defined and migrate_only|lower == "yes"
+  environment:
+    DB_MIGRATION_USER: "{{ EDXAPP_MYSQL_USER_MIGRATE }}"
+    DB_MIGRATION_PASS: "{{ EDXAPP_MYSQL_PASSWORD_MIGRATE }}"
   sudo_user: "{{ edxapp_user }}"
   notify:
   - "restart edxapp"