22 Commits

Author SHA1 Message Date
Marc Koderer
9431ab62af Rename bootstrap.sh to centos-bootstrap.sh
Since Ubuntu and Centos are both valid options it's better
to list their names in both bootstrap files

Trivial-fix

Change-Id: Ie8179403ba550ff61a45aa936fb87e02b9f74861
2016-01-18 14:05:03 +01:00
Marc Koderer
3f4873696c Fix centos AiO setup
LVM2 must be upgraded before device-mapper.
Otherwise the setup fails.

Change-Id: I97f57c1c8fd50621ad7fa0ddf296cc987c227cd2
Fixes-bug: #1534549
2016-01-15 11:59:26 +01:00
Jeffrey Zhang
781eefeccf Remove the kolla-build.conf
use tox -e genconfig to generate this file

DocImpact

Closes-Bug: #1531202
Change-Id: I3a6e57c3cc48aeb3a45a055b173207ea6e214960
2016-01-07 21:06:22 +08:00
Martin André
3aeec10b88 Be more specific in regex used in sed
We want to change *only* the desired option.

Change-Id: Ic67ba474569f6bf7d74bd710364f26be0f0363eb
Close-Bug: #1531046
2016-01-05 11:29:54 +09:00
Jenkins
63f0794851 Merge "Set selinux to permissive in Vagrant" 2016-01-04 11:08:15 +00:00
Martin André
6d7d487601 Set selinux to permissive in Vagrant
Selinux is preventing to write on mounted volumes. Let's set it to
permissive in Vagrant box provisioning.

Change-Id: If8ea57f242166eb6f4ef618639d4ab672e5098d3
Closes-Bug: #1530766
2016-01-04 15:25:22 +09:00
Martin André
f7c196281c Remove docker version pinning for vagrant envs
Kolla now has its own docker ansible module which doesn't require
specific docker version.

Also, add requirement for ansible <2, and stop using NL mirror for
epel.

Change-Id: I743c51c2d6b7f6af0aa4038e1081066b36e36fa1
Partially-Implements: blueprint kolla-docker-module
2016-01-04 11:52:46 +09:00
Diogo Monteiro
c7297e04c1 Update Vagrant's Ubuntu box provisioning script
Starting from Vivid Ubuntu uses systemd as the
default boot manager instead of upstart. Updating
the way the docker daemon is configured to follow
the systemd way.
Setting env variable GUNICORN_OPTS=[--preload]
to fix race condition and avoid IntegrityError
when pushing images to local registry

Change-Id: I841f85015c2c3683ef7e1e454ec1369263063c45
Related-bug: https://github.com/docker/docker-registry/issues/518
Closes-Bug: #1523336
2015-12-07 10:18:40 -05:00
Martin André
5eb67e275e Allow to customize vagrant deployment
Extract the Vagrantfile configuration to a Vagrantfile.custom file, to
permit easy customization of the Vagrant deployment without the need to
modify a file under version control.

Closes-Bug: #1517475
Change-Id: I03e3ef373ec47e3d622b77fa9cf88748db99adaa
2015-11-18 22:39:34 +09:00
Martin André
988ee296d6 Factor out definition of nodes in Vagrantfile
All the nodes, with the exception of the operator, are build the same
with maybe different specs. We can remove the duplication with a bit of
metaprogramming.

Also pass all expected arguments to the provisionning script,and get
rid of hardcoded path to it.

Closes-Bug: #1517476

Change-Id: I515ef1d529d7ec49038662001a3e5345a941fea7
2015-11-18 22:39:06 +09:00
Jenkins
d1a0aa76ea Merge "Remove "../../etc/kolla" from synced folders in Vagrant" 2015-11-18 12:19:49 +00:00
Michal Rostecki
c909d1c50c Remove "../../etc/kolla" from synced folders in Vagrant
That sync broke copying configuration files in Ansible playbooks
and made all changes of configuration inside VM as a change in
kolla git repo on host.

Change-Id: I21ecd9a48c0c3263c05f5dbefea7bbc78a919f0a
Closes-Bug: #1515901
2015-11-18 12:07:16 +09:00
Martin André
70074abd07 Make vagrant bootstrap scripts args more obvious
Also add missing curly braces around variables.

TrivialFix

Change-Id: I8798ec52d9ddf76ad1f3debdf087ed4f51defc38
2015-11-18 11:02:52 +09:00
Diogo Monteiro
d2b388d55c Get kolla path from settings when provisioning box
The path for the kolla source dir was being
hardcoded on the ubuntu-bootstrap provision script
instead of utilizing the path defined in the
PROVIDER_DEFAULTS settings in the Vagrantfile

Change-Id: I0eb752ecf4db580838687c290ccf36810e8a4ff3
2015-11-12 08:55:57 -05:00
Diogo Monteiro
558627b1ce Added Ubuntu support for Vagrant
Added support for Vagrant VirtualBox provider to
provision an Ubuntu VM to run kolla. A new
bootstrap-ubuntu.sh script has been created which
provisions the Ubuntu VM with all kolla depdencies
including docker 1.8.2, ansible 1.9.6 and python-tools
Also created vars in the Vagrantfile to define the cpu and memory settings of the
VM nodes used to run kolla

DocImpact

Change-Id: I4609d7f577e948b04663901afd0c5d1d154c8ac4
Implements: blueprint vagrant-ubuntu-support
2015-11-11 11:26:39 -05:00
Martin André
95517f01fc Use default disk image size for centos/7
Latest centos/7 image from atlas now comes with 40 GB disk size which
is equal to the virtual_size we specify in the Vagrantfile.  Libvirt
provider doesn't like it and produces an ugly stacktrace.

The new default value now sufficient run kolla properly and we can
remove the code that artificially increased the disk size.

Change-Id: I7a645543cfcc027b4a3e0d02d8e7f436d8410ec5
Backport: Liberty
Closes-Bug: #1511265
2015-11-02 01:46:19 +00:00
Michal Rostecki
3baa57ddb7 Pin Docker version to 1.8.2
Currently Ansible have issues with Docker 1.8.3. We have to pin
version to 1.8.2 before including fix [1] in tagged Ansible
version.

[1] https://github.com/ansible/ansible-modules-core/pull/2258

Change-Id: If802ff118782ec521acfff00e286cde703bf37b3
2015-10-15 07:51:14 +02:00
Jenkins
31e50443f6 Merge "Install tox in Vagrant" 2015-10-13 23:54:03 +00:00
Michal Rostecki
aa0a11937d Install tox in Vagrant
Change-Id: I374d5f3702c1874b76e582b8585246d670eeb74a
Closes-Bug: #1505281
2015-10-13 07:57:20 +02:00
Michal Rostecki
31b96d17ec Push images to registry by default in Vagrant
Change-Id: Ia4520cf85531e2508aba7aec9e078f963943af75
Closes-Bug: #1505497
2015-10-13 07:30:45 +02:00
Michal Rostecki
a48fb29f4d Fix path of synced_folder in Vagrantfile
Vagrantfile is in dev/vagrant directory on repository,
so to reach the main directory, it should sync "../.."
path instead of "..".

Change-Id: I7d142c8239423f5de52de5602a732770bb1d7c6c
Closes-Bug: #1504426
2015-10-09 09:50:08 +02:00
Steven Dake
3b92e8714f Move around the development environments
THe top level dev directory is now used to store the heat and
vagrant development environments.

backport: liberty

TrivialFix

Change-Id: Ib0922b90eacaa8518aee09cdeb46f4ac0437e015
2015-10-07 23:47:00 -07:00