Merge lp://qastaging/~canonical-platform-qa/qa-dashboard/vagrant-fixes into lp://qastaging/qa-dashboard
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~canonical-platform-qa/qa-dashboard/vagrant-fixes |
| Merge into: | lp://qastaging/qa-dashboard |
| Diff against target: |
139 lines (+61/-22) 4 files modified
.bzrignore (+4/-0) Vagrantfile (+15/-14) docs/installing.rst (+32/-6) setup.sh (+10/-2) |
| To merge this branch: | bzr merge lp://qastaging/~canonical-platform-qa/qa-dashboard/vagrant-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Pending | |
| Canonical CI Engineering | Pending | ||
|
Review via email:
|
|||
Commit message
Vagrant configuration updated
Description of the change
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,
Unmerged revisions
- 772. By Vincent Ladeuil
-
Switch to nfs for both folders to simplify.
- 771. By Vincent Ladeuil
-
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
-
Update instructions for using libvirt with vagrant (for sites where virtualbox can't be used).
- 769. By Federico Gimenez
-
nfs, valid for both virtualbox and libvirt providers
- 768. By Federico Gimenez
-
rsync for shared folder
- 767. By Federico Gimenez
-
Changes for a working vagrant up
