From 790618151fcf1e0d9b800cef94ae2779fa9f84e0 Mon Sep 17 00:00:00 2001 From: Darren Birkett Date: Thu, 20 Mar 2014 14:57:04 +0000 Subject: [PATCH] update vagrant environment After some recent changes to db/mq endpoints, we need to slightly change the attributes we're overriding in the environment for the vagrant run to work Change-Id: I98279acb94fdfe349d19aa3fb99830f83c9d2d45 Implements: blueprint reference-havana-vagrant --- environments/vagrant-multi-neutron.json | 112 ++++++++++++------------ 1 file changed, 55 insertions(+), 57 deletions(-) diff --git a/environments/vagrant-multi-neutron.json b/environments/vagrant-multi-neutron.json index a77d56e..aab8556 100644 --- a/environments/vagrant-multi-neutron.json +++ b/environments/vagrant-multi-neutron.json @@ -17,68 +17,66 @@ "bind_interface": "eth1" }, "endpoints": { + "host": "192.168.3.60", + "mq": { "host": "192.168.3.60" - }, - "developer_mode": true, - "mq": { - "host": "192.168.3.60", - "bind_interface": "eth1" - }, - "db": { - "host": "192.168.3.60", - "bind_interface": "eth1" - }, - "network": { - "debug": "True", - "dhcp": { - "enable_isolated_metadata": "True" }, - "metadata": { - "nova_metadata_ip": "192.168.3.60" - }, - "openvswitch": { - "tunnel_id_ranges": "1:1000", - "enable_tunneling": "True", - "tenant_network_type": "gre", - "local_ip_interface": "eth2" - }, - "api": { - "bind_interface": "eth1" - } - }, - "image": { - "api": { - "bind_interface": "eth1" - }, - "registry": { - "bind_interface": "eth1" - }, - "image_upload": true, - "upload_images": [ - "cirros", - "ubuntu" - ], - "upload_image": { - "ubuntu": "http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img", - "cirros": "https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img" - } - }, - "compute": { - "xvpvnc_proxy": { - "bind_interface": "eth1" - }, - "novnc_proxy": { - "bind_interface": "eth1" - }, - "libvirt": { - "virt_type": "qemu" + "db": { + "host": "192.168.3.60" }, + "developer_mode": true, "network": { - "public_interface": "eth1", - "service_type": "neutron" + "debug": "True", + "dhcp": { + "enable_isolated_metadata": "True" + }, + "metadata": { + "nova_metadata_ip": "192.168.3.60" + }, + "openvswitch": { + "tunnel_id_ranges": "1:1000", + "enable_tunneling": "True", + "tenant_network_type": "gre", + "local_ip_interface": "eth2" + }, + "api": { + "bind_interface": "eth1" + } }, - "config": { - "ram_allocation_ratio": 5.0 + "image": { + "api": { + "bind_interface": "eth1" + }, + "registry": { + "bind_interface": "eth1" + }, + "image_upload": true, + "upload_images": [ + "cirros", + "ubuntu" + ], + "upload_image": { + "ubuntu": "http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img", + "cirros": "https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img" + } + }, + "compute": { + "xvpvnc_proxy": { + "bind_interface": "eth1" + }, + "novnc_proxy": { + "bind_interface": "eth1" + }, + "libvirt": { + "virt_type": "qemu" + }, + "network": { + "public_interface": "eth1", + "service_type": "neutron" + }, + "config": { + "ram_allocation_ratio": 5.0 + } } } }