Merge pull request #167 from edx/feanil/vagrant_updates

Feanil/vagrant updates

.gitignore

 *.swp
 *.pyc
 .idea/
+.vagrant

Vagrantfile

@@ -5,7 +5,7 @@ Vagrant.configure("2") do |config|
   config.vm.box     = "precise64"
   config.vm.box_url = "http://files.vagrantup.com/precise64.box"
 
-  config.vm.network :private_network, ip: "192.168.111.222"
+  config.vm.network :private_network, ip: "192.168.33.10"
 
   config.vm.provider :virtualbox do |vb|
     vb.customize ["modifyvm", :id, "--memory", MEMORY.to_s]

playbooks/edx_jenkins_tests.yml

@@ -4,7 +4,7 @@
   gather_facts: True
   vars:
     migrate_db: True
-    mysql5_workaround: True
+    openid_workaround: True
     ansible_ssh_private_key_file: /var/lib/jenkins/continuous-integration.pem
   vars_files:
     - "{{ secure_dir }}/vars/edxapp_ref_users.yml"

playbooks/edx_provision_test.yml

@@ -18,7 +18,7 @@
   gather_facts: True
   vars:
     migrate_db: True
-    mysql5_workaround: True
+    openid_workaround: True
     ansible_ssh_private_key_file: /var/lib/jenkins/continuous-integration.pem
   vars_files:
     - "{{ secure_dir }}/vars/edxapp_ref_users.yml"

playbooks/edx_sandbox.yml

@@ -20,7 +20,7 @@
   gather_facts: True
   vars:
     migrate_db: True
-    mysql5_workaround: True
+    openid_workaround: True
   roles:
     - common
     - nginx

playbooks/group_vars/all

@@ -14,6 +14,3 @@ secure_dir: 'secure_example'
 # this indicates the path to site-specific (with precedence)
 # things like nginx template files
 local_dir:  '../../ansible_local'
-
-# default is not to migrate_db
-migrate_db: false
\ No newline at end of file

playbooks/roles/common/tasks/create_users.yml

@@ -26,7 +26,7 @@
   - update
 
 - name: Copying ssh keys for admin users
-  authorized_key: user={{ item.user }} key="{{lookup('file', item.path)}}"
+  authorized_key: user={{ item.user }} key="{{item.path}}"
   with_items: admin_keys
   when: admin_keys is defined
   tags:
@@ -43,7 +43,7 @@
   - update
 
 - name: Copying ssh keys for env users
-  authorized_key: user={{ item.user }} key="{{lookup('file', item.path)}}"
+  authorized_key: user={{ item.user }} key="{{item.path}}"
   with_items: env_keys
   when: env_keys is defined
   tags:

playbooks/roles/edxapp/tasks/deploy.yml

@@ -180,15 +180,16 @@
   when: celery_worker is not defined
 
 # https://code.launchpad.net/~wligtenberg/django-openid-auth/mysql_fix/+merge/22726
-# This is necessary for the local mysql5.5, not sure if this fix will ever get merged
+# This is necessary for when syncdb is run and the django_openid_auth module is installed,
+# not sure if this fix will ever get merged
 # We should never do this in production
-- name: mysql5.5 workaround - NOT FOR PRODUCTION
+- name: openid workaround - NOT FOR PRODUCTION
   shell: sed -i -e 's/claimed_id = models.TextField(max_length=2047, unique=True/claimed_id = models.TextField(max_length=2047/' /opt/edx/lib/python2.7/site-packages/django_openid_auth/models.py
-  when: mysql5_workaround is defined
+  when: openid_workaround is defined
 
 - name: syncdb and migrate
   shell: sudo -u www-data SERVICE_VARIANT=lms /opt/edx/bin/django-admin.py syncdb --migrate --noinput --settings=lms.envs.aws --pythonpath=/opt/wwc/edx-platform
-  when: migrate_db
+  when: migrate_db is defined
   tags:
   - deploy
   - lms

playbooks/vagrant.yml

@@ -4,12 +4,12 @@
   gather_facts: True
   vars:
     migrate_db: True
+    openid_workaround: True
   vars_files:
     - "group_vars/all"
     - "{{ secure_dir }}/vars/edxapp_ref_users.yml"
-    - "{{ secure_dir }}/vars/edxapp_sandbox.yml"
   roles:
     - common
     - nginx
     - edxlocal
-    - edxapp
+    - { role: 'edxapp', lms_nginx_port: 18030, lms_xml_nginx_port: 80 }

playbooks/vagrant/inventory.ini

 [vagrant]
-192.168.111.222
+192.168.33.10