aboutsummaryrefslogtreecommitdiff
path: root/dev
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-18 18:31:26 +0000
committerGerrit Code Review <review@openstack.org>2016-02-18 18:31:26 +0000
commit1649fa27ed450f1ec7aa1501f6a36a7e95b7b323 (patch)
treebf3412030ddbfc5f70835d831cac3db30bf05cc0 /dev
parent54402c7bc9e0c5f9efe3a2ae38528a42e2fdce49 (diff)
parent076fb5a6469a415c0cb947e616c9ab7e662621f6 (diff)
downloadkolla-1649fa27ed450f1ec7aa1501f6a36a7e95b7b323.tar.gz
kolla-1649fa27ed450f1ec7aa1501f6a36a7e95b7b323.zip
Merge "Set nova hypervisor to qemu in Vagrant"
Diffstat (limited to 'dev')
-rw-r--r--dev/vagrant/centos-bootstrap.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/dev/vagrant/centos-bootstrap.sh b/dev/vagrant/centos-bootstrap.sh
index 83d10c074..2555eb479 100644
--- a/dev/vagrant/centos-bootstrap.sh
+++ b/dev/vagrant/centos-bootstrap.sh
@@ -85,7 +85,7 @@ function configure_kolla {
# Configure the operator node and install some additional packages.
function configure_operator {
yum install -y git mariadb && yum clean all
- pip install --upgrade "ansible<2" python-openstackclient tox
+ pip install --upgrade "ansible<2" python-openstackclient python-neutronclient tox
pip install ~vagrant/kolla
@@ -128,6 +128,12 @@ export OS_USER_DOMAIN_ID=default
EOF
chown vagrant: ~vagrant/openrc
+ mkdir -p /etc/kolla/config/nova/
+ cat > /etc/kolla/config/nova/nova-compute.conf <<EOF
+[libvirt]
+virt_type=qemu
+EOF
+
# Launch a local registry (and mirror) to speed up pulling images.
# 0.9.1 is actually the _latest_ tag.