diff options
author | Dan Prince <dprince@redhat.com> | 2015-11-25 11:17:14 -0500 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2015-11-25 15:00:13 -0500 |
commit | fba215a69da02a97f5132671c43a2cc6a5a2c2d1 (patch) | |
tree | 803b080b24dcda5d9d73912866f7c3b67b6031b8 /deprecated/overcloud-vlan-port.yaml | |
parent | 80d929c75f979d99d4e608aae790f38786b4e055 (diff) |
Drop deprecated templates/Makefile/merge.py
This patch drops a bunch of deprecated stuff from
tripleo-heat-templates. Once we remove the Makefile
(which creates overcloud.yaml) we can proceed
in renaming overcloud-without-mergepy.yaml to
overcloud.yaml.
Change-Id: Ic6ab3777d19e207cae29dcbc2e3839815cd80181
Diffstat (limited to 'deprecated/overcloud-vlan-port.yaml')
-rw-r--r-- | deprecated/overcloud-vlan-port.yaml | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/deprecated/overcloud-vlan-port.yaml b/deprecated/overcloud-vlan-port.yaml deleted file mode 100644 index 8f6f6937..00000000 --- a/deprecated/overcloud-vlan-port.yaml +++ /dev/null @@ -1,39 +0,0 @@ -outputs: - controller0PublicIP: - description: Address for registering endpoints in the cloud. - value: {get_attr: [controller0_VLANPort, fixed_ips, 0, ip_address]} -resources: - # Override the main template which can also supply a static route. - controller0_99_VLANPort: - type: OS::Heat::StructuredDeployment - properties: - config: {get_resource: ControllerVLANPortConfig} - server: {get_resource: controller0} - signal_transport: NO_SIGNAL - input_values: - vlan_port: - list_join: - - '/' - - - {get_attr: [controller0_VLANPort, fixed_ips, 0, ip_address]} - # This should also be pulled out of the subnet. May need a - # neutron fix too - XXX make into a parameter and feed it - # in via _overcloud.sh for now. - - '24' - # Tell the instance to apply the default route. - # Reinstate when https://bugs.launchpad.net/heat/+bug/1336656 is - # sorted - # public_interface_route: - # get_attr: [controller0_VLANPort, fixed_ips, 0, subnet, gateway_ip] - ControllerVLANPortConfig: - type: OS::Heat::StructuredConfig - properties: - config: - neutron: - ovs: - public_interface_tag_ip: {get_input: vlan_port} - controller0_VLANPort: - type: OS::Neutron::Port - properties: - name: controller0_vlan - network: public - replacement_policy: AUTO |