Allow 'ctlplane' to be used within Net IP Maps
authorDan Prince <dprince@redhat.com>
Thu, 23 Jul 2015 20:20:56 +0000 (16:20 -0400)
committerDan Prince <dprince@redhat.com>
Sat, 5 Sep 2015 00:16:47 +0000 (00:16 +0000)
commit24f4146cbb2959c849a3396c36e7e89ae6334843
treef8f145517995666982920a6a865a27fb98be2524
parente83af2b8c00d8ae21067b5001e70c030116b0dfe
Allow 'ctlplane' to be used within Net IP Maps

When using network isolation you might want to selective
move one of the services back to the default ctlplane network
by simply using the ServiceNetMap parameter. This patch
adds ctlplane to the output parameters for both
the net_ip_map and net_ip_list_map nested stacks so that
this is possible.

As part of this patch we also split out the NetIpSubnetMap
into its own unique nested stack so that the Heat input
parameters for this stack are more clearly named.

Change-Id: Iaa2dcaebeac896404e87ec0c635688b2a59a9e0f
network/ports/net_ip_list_map.yaml
network/ports/net_ip_map.yaml
network/ports/net_ip_subnet_map.yaml [new file with mode: 0644]
overcloud-resource-registry-puppet.yaml
overcloud-resource-registry.yaml
overcloud-without-mergepy.yaml
puppet/ceph-storage-puppet.yaml
puppet/cinder-storage-puppet.yaml
puppet/compute-puppet.yaml
puppet/controller-puppet.yaml
puppet/swift-storage-puppet.yaml