Merge pull request #251 from edx/jarv/vagrant-updates

vagrant provisioning updates

playbooks/roles/rabbitmq/tasks/main.yml

@@ -52,6 +52,9 @@
 - name: rabbitmq | start rabbit nodes
   service: name=rabbitmq-server state=restarted
 
+- name: rabbitmq | wait for rabbit to start
+  wait_for: port={{ rabbitmq_management_port }} delay=2
+
 - name: rabbitmq | remove guest user
   rabbitmq_user: user="guest" state=absent
 
@@ -78,4 +81,4 @@
 - name: rabbitmq | ensure rabbitmqadmin attributes
   file: 
     path=/usr/local/bin/rabbitmqadmin owner=root 
-    group=root mode=0655
\ No newline at end of file
+    group=root mode=0655

vagrant/fullstack/Vagrantfile

@@ -17,9 +17,8 @@ Vagrant.configure("2") do |config|
   config.vm.provision :ansible do |ansible|
     # point Vagrant at the location of your playbook you want to run
     ansible.playbook = "../../playbooks/vagrant-fullstack.yml"
-
-    ansible.inventory_file = "../../playbooks/vagrant/inventory.ini"
+    ansible.inventory_path = "../../playbooks/vagrant/inventory.ini"
     ansible.extra_vars = { c_skip_grader_checkout: 'True' }
-    ansible.verbose = true
+    ansible.verbose = "extra"
   end
 end

vagrant/shortstack-xml/Vagrantfile

@@ -18,7 +18,7 @@ Vagrant.configure("2") do |config|
     # point Vagrant at the location of your playbook you want to run
     ansible.playbook = "../../playbooks/vagrant-shortstack-xml.yml"
 
-    ansible.inventory_file = "../../playbooks/vagrant/inventory.ini"
-    ansible.verbose = true
+    ansible.inventory_path = "../../playbooks/vagrant/inventory.ini"
+    ansible.verbose = "extra"
   end
 end

vagrant/shortstack/Vagrantfile

@@ -17,8 +17,7 @@ Vagrant.configure("2") do |config|
   config.vm.provision :ansible do |ansible|
     # point Vagrant at the location of your playbook you want to run
     ansible.playbook = "../../playbooks/vagrant-shortstack.yml"
-
-    ansible.inventory_file = "../../playbooks/vagrant/inventory.ini"
-    ansible.verbose = true
+    ansible.inventory_path = "../../playbooks/vagrant/inventory.ini"
+    ansible.verbose = "extra"
   end
 end