Merge lp:~canonical-platform-qa/qa-dashboard/vagrant-fixes into lp:qa-dashboard

[Federico Gimenez]

Vagrant configuration updated

Includes this changes:

* Updated Vagrantfile to the latest version format (customizations for virtualbox inside a provider block) to get rid of a deprecation warning
* Added python-tastypie to the dependencies and updated URL of the database dump in the setup.sh provision script. Also added db related commands and server startup to the provision process.
* The dash directory is shared with rsync between host and guest to prevent file sync problems in the bzr commands

Thanks,

[lp:~canonical-platform-qa/qa-dashboard/vagrant-fixes]

768. By Federico Gimenez on 2015-04-20

rsync for shared folder

769. By Federico Gimenez on 2015-04-20

nfs, valid for both virtualbox and libvirt providers

770. By Vincent Ladeuil on 2015-04-21

Update instructions for using libvirt with vagrant (for sites where virtualbox can't be used).

771. By Vincent Ladeuil on 2015-04-21

Override default rsync default values to remove --copy-links since the code tree is broken in that respect (juju_settings.py ?!?!).

772. By Vincent Ladeuil on 2015-04-22

Switch to nfs for both folders to simplify.

Unmerged revisions

772. By Vincent Ladeuil on 2015-04-22

Switch to nfs for both folders to simplify.

771. By Vincent Ladeuil on 2015-04-21

Override default rsync default values to remove --copy-links since the code tree is broken in that respect (juju_settings.py ?!?!).

770. By Vincent Ladeuil on 2015-04-21

Update instructions for using libvirt with vagrant (for sites where virtualbox can't be used).

769. By Federico Gimenez on 2015-04-20

nfs, valid for both virtualbox and libvirt providers

768. By Federico Gimenez on 2015-04-20

rsync for shared folder

767. By Federico Gimenez on 2015-04-20

Changes for a working vagrant up

=== modified file '.bzrignore'
--- .bzrignore	2013-05-24 20:25:28 +0000
+++ .bzrignore	2015-04-22 07:43:35 +0000
@@ -1,3 +1,7 @@
 plugins.py
 local_settings.py
 *.pyc
+.vagrant/
+branches/*
+build/*
+.sourcecode/

=== modified file 'Vagrantfile'
--- Vagrantfile	2013-02-12 20:44:28 +0000
+++ Vagrantfile	2015-04-22 07:43:35 +0000
@@ -1,18 +1,19 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-Vagrant::Config.run do |dash|
-    dash.vm.box = "qa-dash-devserver"
-    dash.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-i386-vagrant-disk1.box"
-    dash.vm.forward_port 8000, 8000
-    dash.vm.network :hostonly, "33.33.33.10"
-    dash.vm.customize ["modifyvm", :id, "--memory", 512]
-
-    dash.ssh.max_tries = 50
-    dash.ssh.timeout = 300
-
-    dash.vm.share_folder("v-root", "/home/vagrant/dash", ".")
-
-    dash.vm.provision :shell, :path => "setup.sh"
-
+VAGRANTFILE_API_VERSION = '2'
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |dash|
+    dash.vm.box = 'qa-dash-devserver'
+    dash.vm.box_url = 'http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-i386-vagrant-disk1.box'
+
+    dash.vm.network 'private_network', ip: '33.33.33.10'
+
+    dash.vm.provider 'virtualbox' do |vb|
+      vb.customize ['modifyvm', :id, '--memory', 512]
+    end
+    dash.vm.synced_folder '.', '/home/vagrant/dash', type: 'nfs'
+    dash.vm.synced_folder '.', '/vagrant', type: 'nfs'
+
+    dash.vm.provision :shell, :path => 'setup.sh'
 end

=== modified file 'docs/installing.rst'
--- docs/installing.rst	2013-03-27 15:58:26 +0000
+++ docs/installing.rst	2015-04-22 07:43:35 +0000
@@ -10,12 +10,38 @@
 
 Requirements
 ~~~~~~~~~~~~
-To get started, you'll need:
- * Vagrant
-
-sudo apt-get install vagrant
-
-
+To get started, you'll need Vagrant::
+
+  sudo apt-get install vagrant
+
+This will use virtualbox as the default box/machine provider.
+
+Using libvirt instead of virtualbox
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+/!\ virtualbox and qemu/kvm are mutually exclusive, if you're already using
+qemu/kvm, you need a slightly different setup. If you're using virtualbox,
+ignore this section.
+
+Install the pre-requisites::
+
+  sudo apt-get install libxslt-dev libxml2-dev libvirt-dev
+  # the box provider (vagrant-libvirt) and the tool to turn the virtualbox
+  # image provided by cloud-images.c.c into a libvirt one
+  vagrant plugin install vagrant-libvirt vagrant-mutate
+  vagrant box add qa-dash-devserver http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-i386-vagrant-disk1.box
+  vagrant mutate qa-dash-devserver libvirt
+
+From there setting up the machine is achieved with::
+
+  vagrant up --provider=libvirt
+
+
+That should be the only difference with the virtualbox setup which is only::
+
+  vagrant up
+
+    
 Grab the source
 ---------------
 

=== modified file 'setup.sh'
--- setup.sh	2014-04-23 21:30:58 +0000
+++ setup.sh	2015-04-22 07:43:35 +0000
@@ -1,4 +1,5 @@
 VAGRANT_SETUP=/home/vagrant/vagrant-setup
+VAGRANT_DASH=/home/vagrant/dash
 
 echo "Does the vagrant-setup directory exist?"
 if [ ! -f $VAGRANT_SETUP/_dir ]; then
@@ -53,7 +54,7 @@
     echo "Vagrant is already been setup, no need to install packages"
 else
     echo "Install packages"
-    sudo apt-get -y install python python-dev postgresql python-psycopg2 python-django python-django-south python-yaml django-tables python-flake8 python-django-auth-openid python-numpy python-mock
+    sudo apt-get -y install python python-dev postgresql python-psycopg2 python-django python-django-south python-yaml django-tables python-flake8 python-django-auth-openid python-numpy python-mock python-tastypie
 fi
 
 echo "Does the postgres config need updating?"
@@ -68,7 +69,7 @@
 echo "Is there already a database dump? If not, download it"
 if [ ! -f $VAGRANT_SETUP/dash.sql ]; then
         echo "Download database"
-        wget -q http://people.ubuntu.com/~chrisjohnston/qa_dash/dash.tgz -O $VAGRANT_SETUP/dash.tgz
+        wget -q http://people.ubuntu.com/~cjohnston/qa_dash/dash.tgz -O $VAGRANT_SETUP/dash.tgz
         tar xzf $VAGRANT_SETUP/dash.tgz -C $VAGRANT_SETUP
 else
     echo "Database already exists"
@@ -93,5 +94,12 @@
     echo "local_settings.py already exists"
 fi
 
+cd $VAGRANT_DASH && make
+rm -rf .sourcecode && make
+echo 'ALLOWED_HOSTS = ["33.33.33.10"]' >> local_settings.py
+python manage.py syncdb
+python manage.py migrate
+nohup python manage.py runserver 0.0.0.0:8000 > out.txt &
+
 echo "Setup complete!"
 touch $VAGRANT_SETUP/_complete