diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-10-20 21:38:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-10-20 21:38:03 +0000 |
| commit | 88efef101e3ce58d2c9e3f53070df936a497b518 (patch) | |
| tree | 76046777e5ece73bd6b18dab453c1643d6c89337 | |
| parent | 1492592832e4bc07fe019c03f763ae5fbb871a9f (diff) | |
| parent | 0d191cb5d626c19ea9496a4f0a1423f2ff3ed5c9 (diff) | |
Merge "Allow ctlplane network or ID, and default to "ctlplane""
| -rw-r--r-- | overcloud-without-mergepy.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 629cf817..9c915c4a 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -120,9 +120,9 @@ parameters: type: string default: "datacentre:br-ex" NeutronControlPlaneID: - default: '' + default: 'ctlplane' type: string - description: Neutron ID for ctlplane network. + description: Neutron ID or name for ctlplane network. NeutronEnableTunnelling: type: string default: "True" @@ -1107,7 +1107,7 @@ resources: depends_on: Networks properties: name: control_virtual_ip - network_id: {get_param: NeutronControlPlaneID} + network: {get_param: NeutronControlPlaneID} fixed_ips: {get_param: ControlFixedIPs} replacement_policy: AUTO |