diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2013-07-08 19:47:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2013-07-08 19:47:31 +0000 |
| commit | c1661002b078d77d4bdef1835b77537cab5416c1 (patch) | |
| tree | 63cea94b52333c72426c0e21eb12274cd6184467 | |
| parent | 0c5bd2fc23f77c72da73f2d9b7baec4b0edfac6a (diff) | |
| parent | 1da5280d0c35082ae7ccfa12b283c56856cac53a (diff) | |
Merge "Update undercloud-vm for new networking config."
| -rw-r--r-- | undercloud-vm.yaml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml index 87a57494..ee846ce3 100644 --- a/undercloud-vm.yaml +++ b/undercloud-vm.yaml @@ -96,20 +96,18 @@ Resources: ssh_host: 192.168.122.1 type: virsh quantum: - floatingip_range: 172.17.41.0/24 - floatingip_start: 172.17.41.2 - floatingip_end: 172.17.41.254 host: 127.0.0.1 - metadata_proxy_shared_secret: unset ovs_db: mysql://quantum:unset@localhost/ovs_quantum?charset=utf8 ovs: + dnsmasq_range: [192.0.2.25, 192.0.2.44] public_interface: eth0 physical_bridge: br-ctlplane physical_network: ctlplane network_vlan_ranges: ctlplane bridge_mappings: ctlplane:br-ctlplane - fixed_range: 198.51.100.0/24 - ovs_range: 198.51.100.0/24 + fixed_range: + start: 192.0.2.5 + end: 192.0.2.24 tenant_network_type: vlan enable_tunneling: 'False' rabbit: |