9 Commits

Author SHA1 Message Date
Jenkins
0435c6d99e Merge "Update Vagrant dev environment" 2017-06-12 10:59:13 +00:00
Juan J. Martinez
056ecc55ea Update Vagrant dev environment
- Updated Ubuntu image to use 16.04.
 - VirtualBox provider to use centos/7 image + vagrant-vbguest plugin.
 - Improved docs so it is clear that vagrant-vbguest plugin is only
   required with VirtualBox.
 - Clarified comment and made it independent of the release.
 - Refactored the kolla and kolla-ansible paths to be based on the
   username used by Vagrant, that can change depending on the image.

Change-Id: I23d84dcc3297c43eb12eff9c443d282281fc6c82
2017-06-12 07:33:40 +00:00
Juan Martinez
a1d362583f Fix sed replacement command in Ubuntu's install_docker
The 's' command wasn't closed properly. This was fixed in kolla repo
before it was decided that the dev env should go in kolla-ansible.

Change-Id: Ia1434ebb276f0fc76bf88fe386b8e9527133ce4d
2017-06-07 08:23:14 +00:00
Juan J. Martinez
8fe43171ce Fix vagrant development environment
After the repo split into kolla and kolla-ansible the Vagrant
development environment was broken.

With this change Vagrant will run from kolla-ansible and kolla
repo is expected to be in the same directory level so the
bootstrap can include it inside the VM.

 - Modified the bootstrap code to copy both repos into the VM.
 - Added one configuration token to specify kolla-ansible location
   inside the VM.
 - Updated the docs.

Change-Id: I6b56822d50472f8eda6fc60f69196d3c9b8b6cf8
Closes-Bug: 1693847
2017-05-31 14:19:09 +01:00
Jenkins
dcb102608d Merge "Fix broken test in vagrant boostrap script" 2016-11-06 06:00:37 +00:00
Martin André
193a8190ce Fix broken test in vagrant boostrap script
The file path was not properly passed to the '-x' test which caused it
to always return true.

This commit simplifies the test for existing command by relying only on
the exit code of `type` rather than checking that the file path is
executable.

Change-Id: Iaf47d92ff9fd1ef34d8d7492c08ec24d2b8a9536
Closes-Bug: #1635341
2016-10-27 18:24:50 +02:00
caoyuan
5bdf98f7b5 Update "=" to "==" in "if" condition
Keep consistent with other "if" condition
TrivialFix

Change-Id: I18fea71bd50729642543afd4d3bab0b7dfaecd3d
2016-10-22 17:04:13 +08:00
Martin André
e259c2a60d Fix vagrant's kolla folder sync
Correct relative path of kolla root directory after vagrant environment was
moved from dev/vagrant to contrib/dev/vagrant.

Closes-Bug: #1635329

Change-Id: Ib13a6123f34d69884e27029f5144ff1ad165e73e
2016-10-20 17:43:12 +02:00
Christian Berendt
b725bd09dd Move demos and dev directory into a new contrib directory
TrivialFix

Change-Id: Ifb8f19afa1514488bd288670d08b96f84982a4e1
2016-10-14 12:57:49 +02:00