Merge pull request #767 from edx/feanil/vagrant_fixes

Database related updates to fix dev and full stack vagrant builds.

playbooks/roles/discern/defaults/main.yml

@@ -6,7 +6,7 @@ DISCERN_BROKER_URL: ""
 DISCERN_RESULT_BACKEND: ""
 DISCERN_GOOGLE_ANALYTICS_PROPERTY_ID: ""
 DISCERN_MYSQL_DB_NAME: 'discern'
-DISCERN_MYSQL_USER: 'root'
+DISCERN_MYSQL_USER: 'discern001'
 DISCERN_MYSQL_PASSWORD: 'password'
 DISCERN_MYSQL_HOST: 'localhost'
 DISCERN_MYSQL_PORT: '3306'

playbooks/roles/edxapp/defaults/main.yml

@@ -30,7 +30,7 @@ EDXAPP_MONGO_USER: 'edxapp'
 EDXAPP_MONGO_DB_NAME: 'edxapp'
 
 EDXAPP_MYSQL_DB_NAME: 'edxapp'
-EDXAPP_MYSQL_USER: 'root'
+EDXAPP_MYSQL_USER: 'edxapp001'
 EDXAPP_MYSQL_PASSWORD: 'password'
 EDXAPP_MYSQL_HOST: 'localhost'
 EDXAPP_MYSQL_PORT: '3306'

playbooks/roles/edxlocal/tasks/main.yml

@@ -13,41 +13,60 @@
 - name: install packages needed for single server
   apt: pkg={{','.join(edxlocal_debian_pkgs)}} install_recommends=yes state=present
 
+- name: setup the edxapp db user
+  mysql_user: >
+    name={{ EDXAPP_MYSQL_USER }}
+    password={{ EDXAPP_MYSQL_PASSWORD }}
+    priv='{{EDXAPP_MYSQL_DB_NAME}}.*:ALL'
+
 - name: create a database for edxapp
   mysql_db: >
     db=edxapp
-    login_user={{ EDXAPP_MYSQL_USER  }}
-    login_password={{ EDXAPP_MYSQL_PASSWORD }}
     state=present
     encoding=utf8
   when: EDXAPP_MYSQL_USER is defined
     
+- name: setup the xqueue db user
+  mysql_user: >
+    name={{ XQUEUE_MYSQL_USER }}
+    password={{ XQUEUE_MYSQL_PASSWORD }}
+    priv='{{XQUEUE_MYSQL_DB_NAME}}.*:ALL'
+  when: XQUEUE_MYSQL_USER is defined and not devstack
+
 - name: create a database for xqueue
   mysql_db: >
     db=xqueue
-    login_user={{ XQUEUE_MYSQL_USER  }}    
-    login_password={{ XQUEUE_MYSQL_PASSWORD }}    
     state=present
     encoding=utf8
-  when: XQUEUE_MYSQL_USER is defined
+  when: XQUEUE_MYSQL_USER is defined and not devstack
+
+- name: setup the ora db user
+  mysql_user: >
+    name={{ ORA_MYSQL_USER }}
+    password={{ ORA_MYSQL_PASSWORD }}
+    priv='{{ORA_MYSQL_DB_NAME}}.*:ALL'
 
 - name: create a database for ora
   mysql_db: >
     db=ora
-    login_user={{ ORA_MYSQL_USER  }}    
-    login_password={{ ORA_MYSQL_PASSWORD }}    
     state=present
     encoding=utf8
   when: ORA_MYSQL_USER is defined
 
+- name: setup the discern db user
+  mysql_user: >
+    name={{ DISCERN_MYSQL_USER }}
+    password={{ DISCERN_MYSQL_PASSWORD }}
+    priv='{{DISCERN_MYSQL_DB_NAME}}.*:ALL'
+  when: DISCERN_MYSQL_USER is defined and not devstack
+
+
 - name: create a database for discern
   mysql_db: >
     db=discern
-    login_user={{ DISCERN_MYSQL_USER  }}    
-    login_password={{ DISCERN_MYSQL_PASSWORD }}    
     state=present
     encoding=utf8
-  when: DISCERN_MYSQL_USER is defined
+  when: DISCERN_MYSQL_USER is defined and not devstack
 
 
 - name: install memcached

playbooks/roles/ora/defaults/main.yml

@@ -69,7 +69,7 @@ ORA_DJANGO_PASSWORD: "password"
 ORA_URL: "http://localhost:18060"
 
 ORA_MYSQL_DB_NAME: 'ora'
-ORA_MYSQL_USER: 'root'
+ORA_MYSQL_USER: 'ora001'
 ORA_MYSQL_PASSWORD: 'password'
 ORA_MYSQL_HOST: 'localhost'
 ORA_MYSQL_PORT: '3306'

playbooks/roles/xqueue/defaults/main.yml

@@ -41,7 +41,7 @@ XQUEUE_RABBITMQ_HOSTNAME: 'localhost'
 XQUEUE_LANG: 'en_US.UTF-8'
 
 XQUEUE_MYSQL_DB_NAME: 'xqueue'
-XQUEUE_MYSQL_USER: 'root'
+XQUEUE_MYSQL_USER: 'xqueue001'
 XQUEUE_MYSQL_PASSWORD: 'password'
 XQUEUE_MYSQL_HOST: 'localhost'
 XQUEUE_MYSQL_PORT: '3306'
@@ -73,7 +73,6 @@ xqueue_auth_config:
   RABBITMQ_USER: $XQUEUE_RABBITMQ_USER
   RABBITMQ_PASS: $XQUEUE_RABBITMQ_PASS
 
-xqueue_create_db: 'yes'
 xqueue_source_repo: https://github.com/edx/xqueue.git
 xqueue_version: 'HEAD'
 xqueue_pre_requirements_file:    "{{ xqueue_code_dir }}/pre-requirements.txt"

playbooks/roles/xqueue/tasks/main.yml

@@ -32,18 +32,6 @@
   notify:
   - restart xqueue
 
-- name: create xqueue db
-  mysql_db: >
-    name={{xqueue_auth_config.DATABASES.default.NAME}}
-    login_host={{xqueue_auth_config.DATABASES.default.HOST}}
-    login_user={{xqueue_auth_config.DATABASES.default.USER}}
-    login_password={{xqueue_auth_config.DATABASES.default.PASSWORD}}
-    state=present
-    encoding=utf8
-  notify:
-  - restart xqueue
-  when: xqueue_create_db is defined and xqueue_create_db|lower == "yes"
-
 - include: deploy.yml tags=deploy
 
 

playbooks/vagrant-fullstack.yml

@@ -33,5 +33,4 @@
     - forum
     - { role: "xqueue", update_users: True }
     - ora
-    - discern
     - edx_ansible

vagrant/base/devstack/Vagrantfile

@@ -29,8 +29,6 @@ Vagrant.configure("2") do |config|
   config.vm.synced_folder "#{forum_mount_dir}", "/edx/app/forum/cs_comments_service", :create => true, nfs: true
   config.vm.synced_folder "#{ora_mount_dir}", "/edx/app/ora/ora", :create => true, nfs: true
 
-  config.hostsupdater.aliases = ["preview.localhost"]
-
   # Enable X11 forwarding so we can interact with GUI applications
   if ENV['VAGRANT_X11']
       config.ssh.forward_x11 = true