906d7cd40b
This change is congruent with I6dd02ae17407f8f4c81ae418e5027f4f38ae4e9b but applies to undercloud configs rather than overcloud configs. I've listed this as closing 138709 even though that bug didn't talk about the undercloud as this seems like it's another instance of the same issue seen there. Change-Id: I3ee80043bb455460991e78525fa4310934df4697 Closes-Bug: #1383709
37 lines
1.3 KiB
YAML
37 lines
1.3 KiB
YAML
outputs:
|
|
PublicIP:
|
|
description: Address for registering endpoints in the cloud.
|
|
value: {get_attr: [undercloud_VLANPort, fixed_ips, 0, ip_address]}
|
|
resources:
|
|
# Override the main template which can also supply a static route.
|
|
undercloud_99VLANPort:
|
|
type: OS::Heat::StructuredDeployment
|
|
properties:
|
|
config: {get_resource: undercloudVLANPortConfig}
|
|
server: {get_resource: undercloud}
|
|
signal_transport: NO_SIGNAL
|
|
undercloudVLANPortConfig:
|
|
type: OS::Heat::StructuredConfig
|
|
properties:
|
|
config:
|
|
neutron:
|
|
ovs:
|
|
public_interface_tag_ip:
|
|
Fn::Join:
|
|
- '/'
|
|
- - {get_attr: [undercloud_VLANPort, fixed_ips, 0, ip_address]}
|
|
- '24'
|
|
# 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 _undercloud.sh for now.
|
|
# Tell the instance to apply the default route.
|
|
# Reinstate when https://bugs.launchpad.net/heat/+bug/1336656 is
|
|
# sorted
|
|
# public_interface_route:
|
|
# get_attr: [undercloud_VLANPort, fixed_ips, 0, subnet, gateway_ip]
|
|
undercloud_VLANPort:
|
|
type: OS::Neutron::Port
|
|
properties:
|
|
name: undercloud_vlan
|
|
network: public
|
|
replacement_policy: AUTO |