Merge "update vagrant environment"

This commit is contained in:
Jenkins 2014-03-20 15:31:04 +00:00 committed by Gerrit Code Review
commit 23c9384440
1 changed files with 55 additions and 57 deletions

View File

@ -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
}
}
}
}