diff options
| author |   Robert Collins <rbtcollins@hp.com> | 2013-08-12 20:29:14 +1200 |
|---|---|---|
| committer | Robert Collins <rbtcollins@hp.com> | 2013-08-12 20:29:14 +1200 |
| commit | 9d80bede79ab5fb2a65f620aec8601e6ad4a213c (patch) | |
| tree | f1890505b11d34af90feb6bdd3a9057a4fbb5f9d | |
| parent | f733956be86596f887ac0bee9b00f60c082ec608 (diff) | |
Remove unused network configuration metadata.
This is supplied to neutron etc via API calls - having it in Heat
leads to having redundancy, confusion and tricky scripts. Incubator
now has scripts to configure this and instances won't consult these
keys.
Change-Id: Ia45d9bf5bb326ec88f9f4a48c5520570cf5b6d72
| -rw-r--r-- | overcloud-source.yaml | 8 | ||||
| -rw-r--r-- | undercloud-vm.yaml | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index a6285f7a..f8916ea0 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -101,7 +101,7 @@ Resources: Ref: AWS::Region waitcondition_server_url: http://0.0.0.0:8000/v1/waitcondition interfaces: - control: eth2 + control: eth0 keystone: db: mysql://keystone:unset@localhost/keystone host: 0.0.0.0 @@ -111,16 +111,12 @@ Resources: host: 0.0.0.0 metadata-proxy: true neutron: - floatingip_end: 192.0.2.64 - floatingip_range: 192.0.2.0/24 - floatingip_start: 192.0.2.45 host: 0.0.0.0 metadata_proxy_shared_secret: unset ovs: enable_tunneling: 'True' - ovs_range: 10.0.0.0/8 local_ip: 0.0.0.0 - public_interface: eth2 + public_interface: eth0 tenant_network_type: gre ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8 rabbit: diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml index 36c70bc6..fbc589ab 100644 --- a/undercloud-vm.yaml +++ b/undercloud-vm.yaml @@ -103,9 +103,6 @@ Resources: physical_network: ctlplane network_vlan_ranges: ctlplane bridge_mappings: ctlplane:br-ctlplane - fixed_range: - start: 192.0.2.5 - end: 192.0.2.24 tenant_network_type: vlan enable_tunneling: 'False' rabbit: |