Merge "Drop EC2MetadataIp parameter and its uses"

This commit is contained in:
Zuul 2019-07-09 19:15:48 +00:00 committed by Gerrit Code Review
commit c576556c58
49 changed files with 36 additions and 344 deletions

View File

@ -169,11 +169,6 @@ parameters:
If not set the nameservers configured in the ctlplane subnet's If not set the nameservers configured in the ctlplane subnet's
dns_nameservers attribute will be used. dns_nameservers attribute will be used.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
# NOTE(hjensas): We need these because the default network_data.yaml define # NOTE(hjensas): We need these because the default network_data.yaml define
# vlan for all networks. # vlan for all networks.
ExternalNetworkVlanID: ExternalNetworkVlanID:

View File

@ -157,11 +157,6 @@ parameters:
If not set the nameservers configured in the ctlplane subnet's If not set the nameservers configured in the ctlplane subnet's
dns_nameservers attribute will be used. dns_nameservers attribute will be used.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
# NOTE(hjensas): We need these because the default network_data.yaml define # NOTE(hjensas): We need these because the default network_data.yaml define
# vlan for all networks. # vlan for all networks.
ExternalNetworkVlanID: ExternalNetworkVlanID:

View File

@ -154,11 +154,6 @@ parameters:
If not set the nameservers configured in the ctlplane subnet's If not set the nameservers configured in the ctlplane subnet's
dns_nameservers attribute will be used. dns_nameservers attribute will be used.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
# NOTE(hjensas): We need these because the default network_data.yaml define # NOTE(hjensas): We need these because the default network_data.yaml define
# vlan for all networks. # vlan for all networks.
ExternalNetworkVlanID: ExternalNetworkVlanID:

View File

@ -86,11 +86,6 @@ parameters:
If not set the nameservers configured in the ctlplane subnet's If not set the nameservers configured in the ctlplane subnet's
dns_nameservers attribute will be used. dns_nameservers attribute will be used.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:
@ -114,8 +109,6 @@ resources:
- default: true - default: true
ip_netmask: 0.0.0.0/0 ip_netmask: 0.0.0.0/0
next_hop: {get_param: ControlPlaneDefaultRoute} next_hop: {get_param: ControlPlaneDefaultRoute}
- ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
- type: interface - type: interface
name: nic4 name: nic4
mtu: 1350 mtu: 1350

View File

@ -108,11 +108,6 @@ parameters:
If not set the nameservers configured in the ctlplane subnet's If not set the nameservers configured in the ctlplane subnet's
dns_nameservers attribute will be used. dns_nameservers attribute will be used.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:

View File

@ -112,11 +112,6 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
ExternalInterfaceDefaultRoute: ExternalInterfaceDefaultRoute:
default: '10.0.0.1' default: '10.0.0.1'
description: default route for the external network description: default route for the external network
@ -145,8 +140,6 @@ resources:
- default: true - default: true
ip_netmask: 0.0.0.0/0 ip_netmask: 0.0.0.0/0
next_hop: {get_param: ControlPlaneDefaultRoute} next_hop: {get_param: ControlPlaneDefaultRoute}
- ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
- type: interface - type: interface
name: nic3 name: nic3
mtu: 1350 mtu: 1350

View File

@ -112,11 +112,6 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:
@ -140,8 +135,6 @@ resources:
- default: true - default: true
ip_netmask: 0.0.0.0/0 ip_netmask: 0.0.0.0/0
next_hop: {get_param: ControlPlaneDefaultRoute} next_hop: {get_param: ControlPlaneDefaultRoute}
- ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
- type: interface - type: interface
name: nic3 name: nic3
mtu: 1350 mtu: 1350

View File

@ -160,11 +160,6 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:
@ -188,8 +183,6 @@ resources:
- default: true - default: true
ip_netmask: 0.0.0.0/0 ip_netmask: 0.0.0.0/0
next_hop: {get_param: ControlPlaneDefaultRoute} next_hop: {get_param: ControlPlaneDefaultRoute}
- ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
- type: ovs_bridge - type: ovs_bridge
name: br-ex name: br-ex
dns_servers: {get_param: DnsServers} dns_servers: {get_param: DnsServers}

View File

@ -108,11 +108,6 @@ parameters:
If not set the nameservers configured in the ctlplane subnet's If not set the nameservers configured in the ctlplane subnet's
dns_nameservers attribute will be used. dns_nameservers attribute will be used.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:

View File

@ -86,11 +86,6 @@ parameters:
If not set the nameservers configured in the ctlplane subnet's If not set the nameservers configured in the ctlplane subnet's
dns_nameservers attribute will be used. dns_nameservers attribute will be used.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:
@ -115,8 +110,6 @@ resources:
- - {get_param: ControlPlaneIp} - - {get_param: ControlPlaneIp}
- {get_param: ControlPlaneSubnetCidr} - {get_param: ControlPlaneSubnetCidr}
routes: routes:
- ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
- default: true - default: true
next_hop: {get_param: ControlPlaneDefaultRoute} next_hop: {get_param: ControlPlaneDefaultRoute}
- type: interface - type: interface

View File

@ -86,11 +86,6 @@ parameters:
If not set the nameservers configured in the ctlplane subnet's If not set the nameservers configured in the ctlplane subnet's
dns_nameservers attribute will be used. dns_nameservers attribute will be used.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:

View File

@ -112,11 +112,6 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
ExternalInterfaceDefaultRoute: ExternalInterfaceDefaultRoute:
default: '10.0.0.1' default: '10.0.0.1'
description: default route for the external network description: default route for the external network
@ -146,8 +141,6 @@ resources:
- - {get_param: ControlPlaneIp} - - {get_param: ControlPlaneIp}
- {get_param: ControlPlaneSubnetCidr} - {get_param: ControlPlaneSubnetCidr}
routes: routes:
- ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
- default: true - default: true
next_hop: {get_param: ControlPlaneDefaultRoute} next_hop: {get_param: ControlPlaneDefaultRoute}
- type: ovs_bridge - type: ovs_bridge

View File

@ -112,11 +112,6 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:
@ -141,8 +136,6 @@ resources:
- - {get_param: ControlPlaneIp} - - {get_param: ControlPlaneIp}
- {get_param: ControlPlaneSubnetCidr} - {get_param: ControlPlaneSubnetCidr}
routes: routes:
- ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
- default: true - default: true
next_hop: {get_param: ControlPlaneDefaultRoute} next_hop: {get_param: ControlPlaneDefaultRoute}
- type: interface - type: interface

View File

@ -160,11 +160,6 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:
@ -188,9 +183,6 @@ resources:
- / - /
- - {get_param: ControlPlaneIp} - - {get_param: ControlPlaneIp}
- {get_param: ControlPlaneSubnetCidr} - {get_param: ControlPlaneSubnetCidr}
routes:
- ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
- type: ovs_bridge - type: ovs_bridge
name: br-ex name: br-ex
dns_servers: {get_param: DnsServers} dns_servers: {get_param: DnsServers}

View File

@ -108,11 +108,6 @@ parameters:
If not set the nameservers configured in the ctlplane subnet's If not set the nameservers configured in the ctlplane subnet's
dns_nameservers attribute will be used. dns_nameservers attribute will be used.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:

View File

@ -86,11 +86,6 @@ parameters:
If not set the nameservers configured in the ctlplane subnet's If not set the nameservers configured in the ctlplane subnet's
dns_nameservers attribute will be used. dns_nameservers attribute will be used.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:
@ -111,8 +106,6 @@ resources:
- - {get_param: ControlPlaneIp} - - {get_param: ControlPlaneIp}
- {get_param: ControlPlaneSubnetCidr} - {get_param: ControlPlaneSubnetCidr}
routes: routes:
- ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
- default: true - default: true
next_hop: {get_param: ControlPlaneDefaultRoute} next_hop: {get_param: ControlPlaneDefaultRoute}
- type: interface - type: interface

View File

@ -108,11 +108,6 @@ parameters:
If not set the nameservers configured in the ctlplane subnet's If not set the nameservers configured in the ctlplane subnet's
dns_nameservers attribute will be used. dns_nameservers attribute will be used.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:

View File

@ -112,11 +112,6 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:
@ -137,8 +132,6 @@ resources:
- - {get_param: ControlPlaneIp} - - {get_param: ControlPlaneIp}
- {get_param: ControlPlaneSubnetCidr} - {get_param: ControlPlaneSubnetCidr}
routes: routes:
- ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
- default: true - default: true
next_hop: {get_param: ControlPlaneDefaultRoute} next_hop: {get_param: ControlPlaneDefaultRoute}
- type: interface - type: interface

View File

@ -154,11 +154,6 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:
@ -178,9 +173,6 @@ resources:
- / - /
- - {get_param: ControlPlaneIp} - - {get_param: ControlPlaneIp}
- {get_param: ControlPlaneSubnetCidr} - {get_param: ControlPlaneSubnetCidr}
routes:
- ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
- type: ovs_bridge - type: ovs_bridge
name: br-ex name: br-ex
dns_servers: {get_param: DnsServers} dns_servers: {get_param: DnsServers}

View File

@ -108,11 +108,6 @@ parameters:
If not set the nameservers configured in the ctlplane subnet's If not set the nameservers configured in the ctlplane subnet's
dns_nameservers attribute will be used. dns_nameservers attribute will be used.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:

View File

@ -67,7 +67,6 @@ example:
parameter_defaults: parameter_defaults:
ControlPlaneDefaultRoute: 192.168.122.130 ControlPlaneDefaultRoute: 192.168.122.130
ControlPlaneSubnetCidr: "24" ControlPlaneSubnetCidr: "24"
EC2MetadataIp: "192.168.24.1"
In this example, 192.168.122.130 is the external management IP of an In this example, 192.168.122.130 is the external management IP of an
undercloud, thus it is the default route for the configured local_ip value of undercloud, thus it is the default route for the configured local_ip value of

View File

@ -43,7 +43,6 @@ resources:
map_merge: map_merge:
- {get_attr: [DeployedServerPortMapParameter, value]} - {get_attr: [DeployedServerPortMapParameter, value]}
- DeploymentSwiftDataMap: {get_param: DeployedServerDeploymentSwiftDataMap} - DeploymentSwiftDataMap: {get_param: DeployedServerDeploymentSwiftDataMap}
- EC2MetadataIp: {get_param: DefaultRouteIp}
- ControlPlaneDefaultRoute: {get_param: DefaultRouteIp} - ControlPlaneDefaultRoute: {get_param: DefaultRouteIp}
- {get_param: RoleCounts} - {get_param: RoleCounts}

View File

@ -44,10 +44,6 @@ parameters:
EnableInternalTLS: EnableInternalTLS:
type: boolean type: boolean
default: false default: false
MetadataNATRule:
default: false
description: When true we create the NAT rule for the metadata service
type: boolean
NovaWorkers: NovaWorkers:
default: 0 default: 0
description: Number of workers for Nova services. description: Number of workers for Nova services.
@ -70,7 +66,6 @@ parameters:
conditions: conditions:
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]} internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
need_metadata_nat_rule: {equals: [{get_param: MetadataNATRule}, true]}
nova_workers_zero: {equals : [{get_param: NovaWorkers}, 0]} nova_workers_zero: {equals : [{get_param: NovaWorkers}, 0]}
is_neutron_shared_metadata_notempty: {not: {equals: [{get_param: NeutronMetadataProxySharedSecret}, '']}} is_neutron_shared_metadata_notempty: {not: {equals: [{get_param: NeutronMetadataProxySharedSecret}, '']}}
@ -118,20 +113,6 @@ outputs:
- get_attr: [ApacheServiceBase, role_data, config_settings] - get_attr: [ApacheServiceBase, role_data, config_settings]
- get_attr: [NovaMetadataLogging, config_settings] - get_attr: [NovaMetadataLogging, config_settings]
- apache::default_vhost: false - apache::default_vhost: false
- tripleo::nova_metadata::firewall_rules:
if:
- need_metadata_nat_rule
- '144 undercloud metadata nat':
dport: 80
proto: 'tcp'
table: 'nat'
chain: 'PREROUTING'
jump: 'REDIRECT'
iniface: 'br-ctlplane'
destination: '169.254.169.254/32'
extras:
toports: 8775
- {}
- tripleo::nova_metadata::firewall_rules: - tripleo::nova_metadata::firewall_rules:
'139 nova_metadata': '139 nova_metadata':
dport: dport:

View File

@ -191,7 +191,6 @@ parameter_defaults:
MySQLServerOptions: MySQLServerOptions:
mysqld: mysqld:
connect_timeout: 60 connect_timeout: 60
MetadataNATRule: false
# TODO(emilien) Remove when Keepalived 2.0.6 is out # TODO(emilien) Remove when Keepalived 2.0.6 is out
# https://bugs.launchpad.net/tripleo/+bug/1791238 # https://bugs.launchpad.net/tripleo/+bug/1791238
KeepalivedRestart: true KeepalivedRestart: true

View File

@ -203,9 +203,6 @@ def _local_neutron_segments_and_subnets(sdk, ctlplane_id, net_cidrs):
name = CONF['local_subnet'] name = CONF['local_subnet']
subnet = _get_subnet(sdk, s['NetworkCidr'], ctlplane_id) subnet = _get_subnet(sdk, s['NetworkCidr'], ctlplane_id)
segment = _get_segment(sdk, CONF['physical_network'], ctlplane_id) segment = _get_segment(sdk, CONF['physical_network'], ctlplane_id)
host_routes = [{'destination': '169.254.169.254/32',
'nexthop': CONF['local_ip']}]
host_routes += s['HostRoutes']
if subnet: if subnet:
if CONF['enable_routed_networks'] and subnet.segment_id == None: if CONF['enable_routed_networks'] and subnet.segment_id == None:
# The subnet exists and does not have a segment association. Since # The subnet exists and does not have a segment association. Since
@ -215,8 +212,9 @@ def _local_neutron_segments_and_subnets(sdk, ctlplane_id, net_cidrs):
# subnet. # subnet.
_neutron_add_subnet_segment_association(sdk, subnet.id, segment.id) _neutron_add_subnet_segment_association(sdk, subnet.id, segment.id)
_neutron_subnet_update( _neutron_subnet_update(
sdk, subnet.id, s['NetworkCidr'], s['NetworkGateway'], host_routes, sdk, subnet.id, s['NetworkCidr'], s['NetworkGateway'],
s.get('AllocationPools'), name, s['DnsNameServers']) s['HostRoutes'], s.get('AllocationPools'), name,
s['DnsNameServers'])
else: else:
if CONF['enable_routed_networks']: if CONF['enable_routed_networks']:
segment_id = segment.id segment_id = segment.id
@ -224,7 +222,7 @@ def _local_neutron_segments_and_subnets(sdk, ctlplane_id, net_cidrs):
segment_id = None segment_id = None
subnet = _neutron_subnet_create( subnet = _neutron_subnet_create(
sdk, ctlplane_id, s['NetworkCidr'], s['NetworkGateway'], sdk, ctlplane_id, s['NetworkCidr'], s['NetworkGateway'],
host_routes, s.get('AllocationPools'), name, segment_id, s['HostRoutes'], s.get('AllocationPools'), name, segment_id,
s['DnsNameServers']) s['DnsNameServers'])
# If the subnet is IPv6 we need to start a router so that router # If the subnet is IPv6 we need to start a router so that router
# advertisments are sent out for stateless IP addressing to work. # advertisments are sent out for stateless IP addressing to work.
@ -243,17 +241,13 @@ def _remote_neutron_segments_and_subnets(sdk, ctlplane_id, net_cidrs):
if name == CONF['local_subnet']: if name == CONF['local_subnet']:
continue continue
phynet = name phynet = name
metadata_nexthop = s['NetworkGateway']
host_routes = [{'destination': '169.254.169.254/32',
'nexthop': metadata_nexthop}]
host_routes += s['HostRoutes']
subnet = _get_subnet(sdk, s['NetworkCidr'], ctlplane_id) subnet = _get_subnet(sdk, s['NetworkCidr'], ctlplane_id)
segment = _get_segment(sdk, phynet, ctlplane_id) segment = _get_segment(sdk, phynet, ctlplane_id)
if subnet: if subnet:
_neutron_segment_update(sdk, subnet.segment_id, name) _neutron_segment_update(sdk, subnet.segment_id, name)
_neutron_subnet_update( _neutron_subnet_update(
sdk, subnet.id, s['NetworkCidr'], s['NetworkGateway'], sdk, subnet.id, s['NetworkCidr'], s['NetworkGateway'],
host_routes, s.get('AllocationPools'), name, s['HostRoutes'], s.get('AllocationPools'), name,
s['DnsNameServers']) s['DnsNameServers'])
else: else:
if segment: if segment:
@ -263,7 +257,7 @@ def _remote_neutron_segments_and_subnets(sdk, ctlplane_id, net_cidrs):
phynet) phynet)
subnet = _neutron_subnet_create( subnet = _neutron_subnet_create(
sdk, ctlplane_id, s['NetworkCidr'], s['NetworkGateway'], sdk, ctlplane_id, s['NetworkCidr'], s['NetworkGateway'],
host_routes, s.get('AllocationPools'), name, segment.id, s['HostRoutes'], s.get('AllocationPools'), name, segment.id,
s['DnsNameServers']) s['DnsNameServers'])
# If the subnet is IPv6 we need to start a router so that router # If the subnet is IPv6 we need to start a router so that router
# advertisments are sent out for stateless IP addressing to work. # advertisments are sent out for stateless IP addressing to work.

View File

@ -52,11 +52,6 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp: # Here for compatability, not used.
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
{%- for network in networks %} {%- for network in networks %}
{{network.name}}IpSubnet: {{network.name}}IpSubnet:
default: '' default: ''

View File

@ -38,11 +38,6 @@ parameters:
If not set the nameservers configured in the ctlplane subnet's If not set the nameservers configured in the ctlplane subnet's
dns_nameservers attribute will be used. dns_nameservers attribute will be used.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp: # Here for compatability, not used.
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
{%- for network in networks %} {%- for network in networks %}
{{network.name}}IpSubnet: {{network.name}}IpSubnet:
default: '' default: ''

View File

@ -66,11 +66,7 @@ parameters:
If not set the nameservers configured in the ctlplane subnet's If not set the nameservers configured in the ctlplane subnet's
dns_nameservers attribute will be used. dns_nameservers attribute will be used.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig
@ -98,10 +94,7 @@ resources:
next_hop: next_hop:
get_param: ControlPlaneDefaultRoute get_param: ControlPlaneDefaultRoute
default: true default: true
- ip_netmask:
get_param: EC2MetadataIp
next_hop:
get_param: ControlPlaneDefaultRoute
outputs: outputs:
OS::stack_id: OS::stack_id:
description: The OsNetConfigImpl resource. description: The OsNetConfigImpl resource.

View File

@ -41,11 +41,6 @@ parameters:
If not set the nameservers configured in the ctlplane subnet's If not set the nameservers configured in the ctlplane subnet's
dns_nameservers attribute will be used. dns_nameservers attribute will be used.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp: # Here for compatability, not used.
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
{%- for network in networks %} {%- for network in networks %}
{{network.name}}IpSubnet: {{network.name}}IpSubnet:
default: '' default: ''

View File

@ -81,11 +81,6 @@ parameters:
tripleoclient to provide an easy means to pass in custom net configs tripleoclient to provide an easy means to pass in custom net configs
for a standalone node. for a standalone node.
type: json type: json
EC2MetadataIp: # Here for compatability, not used.
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
conditions: conditions:
standalone_net_config_override: standalone_net_config_override:

View File

@ -67,11 +67,7 @@ parameters:
If not set the nameservers configured in the ctlplane subnet's If not set the nameservers configured in the ctlplane subnet's
dns_nameservers attribute will be used. dns_nameservers attribute will be used.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig
@ -101,9 +97,6 @@ resources:
- - get_param: ControlPlaneIp - - get_param: ControlPlaneIp
- get_param: ControlPlaneSubnetCidr - get_param: ControlPlaneSubnetCidr
routes: routes:
- ip_netmask: 169.254.169.254/32
next_hop:
get_param: EC2MetadataIp
- default: true - default: true
next_hop: next_hop:
get_param: ControlPlaneDefaultRoute get_param: ControlPlaneDefaultRoute

View File

@ -71,11 +71,7 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig
@ -102,9 +98,6 @@ resources:
- - get_param: ControlPlaneIp - - get_param: ControlPlaneIp
- get_param: ControlPlaneSubnetCidr - get_param: ControlPlaneSubnetCidr
routes: routes:
- ip_netmask: 169.254.169.254/32
next_hop:
get_param: EC2MetadataIp
- default: true - default: true
next_hop: next_hop:
get_param: ControlPlaneDefaultRoute get_param: ControlPlaneDefaultRoute

View File

@ -70,11 +70,7 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig
@ -101,9 +97,6 @@ resources:
- - get_param: ControlPlaneIp - - get_param: ControlPlaneIp
- get_param: ControlPlaneSubnetCidr - get_param: ControlPlaneSubnetCidr
routes: routes:
- ip_netmask: 169.254.169.254/32
next_hop:
get_param: EC2MetadataIp
- default: true - default: true
next_hop: next_hop:
get_param: ControlPlaneDefaultRoute get_param: ControlPlaneDefaultRoute

View File

@ -77,11 +77,6 @@ parameters:
default: {} default: {}
description: Custom JSON data to be used to override the os-net-config data in this template. This is meant to be used by net_config_override parameter in tripleoclient to provide an easy means to pass in custom net configs for the Undercloud. description: Custom JSON data to be used to override the os-net-config data in this template. This is meant to be used by net_config_override parameter in tripleoclient to provide an easy means to pass in custom net configs for the Undercloud.
type: json type: json
EC2MetadataIp: # Here for compatability, not used.
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
conditions: conditions:
undercloud_net_config_override: undercloud_net_config_override:

View File

@ -86,11 +86,6 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
BondInterfaceOvsOptions: BondInterfaceOvsOptions:
default: bond_mode=active-backup default: bond_mode=active-backup
description: 'The ovs_options or bonding_options string for the bond description: 'The ovs_options or bonding_options string for the bond
@ -166,11 +161,8 @@ resources:
routes: routes:
list_concat_unique: list_concat_unique:
- get_param: ControlPlaneStaticRoutes - get_param: ControlPlaneStaticRoutes
- - ip_netmask: 169.254.169.254/32
next_hop:
get_param: EC2MetadataIp
{%- if role.default_route_networks is not defined or 'ControlPlane' in role.default_route_networks %} {%- if role.default_route_networks is not defined or 'ControlPlane' in role.default_route_networks %}
- default: true - - default: true
next_hop: next_hop:
get_param: ControlPlaneDefaultRoute get_param: ControlPlaneDefaultRoute
{%- endif %} {%- endif %}

View File

@ -74,11 +74,6 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
BondInterfaceOvsOptions: BondInterfaceOvsOptions:
default: '' default: ''
description: 'The ovs_options or bonding_options string for the bond description: 'The ovs_options or bonding_options string for the bond
@ -113,10 +108,7 @@ resources:
routes: routes:
list_concat_unique: list_concat_unique:
- get_param: ControlPlaneStaticRoutes - get_param: ControlPlaneStaticRoutes
- - ip_netmask: 169.254.169.254/32 - - default: true # NOTE(hjensas): This is the IPv4 default route
next_hop:
get_param: EC2MetadataIp
- default: true # NOTE(hjensas): This is the IPv4 default route
next_hop: next_hop:
get_param: ControlPlaneDefaultRoute get_param: ControlPlaneDefaultRoute
- type: ovs_bridge - type: ovs_bridge

View File

@ -72,11 +72,6 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
BondInterfaceOvsOptions: BondInterfaceOvsOptions:
default: bond_mode=active-backup default: bond_mode=active-backup
description: 'The ovs_options or bonding_options string for the bond description: 'The ovs_options or bonding_options string for the bond
@ -127,10 +122,7 @@ resources:
routes: routes:
list_concat_unique: list_concat_unique:
- get_param: ControlPlaneStaticRoutes - get_param: ControlPlaneStaticRoutes
- - ip_netmask: 169.254.169.254/32 - - default: true # NOTE(hjensas): This is the IPv4 default route
next_hop:
get_param: EC2MetadataIp
- default: true # NOTE(hjensas): This is the IPv4 default route
next_hop: next_hop:
get_param: ControlPlaneDefaultRoute get_param: ControlPlaneDefaultRoute
- type: ovs_bridge - type: ovs_bridge

View File

@ -83,11 +83,6 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
BondInterfaceOvsOptions: BondInterfaceOvsOptions:
default: bond_mode=active-backup default: bond_mode=active-backup
description: 'The ovs_options or bonding_options string for the bond description: 'The ovs_options or bonding_options string for the bond
@ -144,11 +139,8 @@ resources:
routes: routes:
list_concat_unique: list_concat_unique:
- get_param: ControlPlaneStaticRoutes - get_param: ControlPlaneStaticRoutes
- - ip_netmask: 169.254.169.254/32
next_hop:
get_param: EC2MetadataIp
{%- if role.default_route_networks is not defined or 'ControlPlane' in role.default_route_networks %} {%- if role.default_route_networks is not defined or 'ControlPlane' in role.default_route_networks %}
- default: true - - default: true
next_hop: next_hop:
get_param: ControlPlaneDefaultRoute get_param: ControlPlaneDefaultRoute
{%- endif %} {%- endif %}

View File

@ -76,11 +76,7 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig
@ -111,10 +107,7 @@ resources:
routes: routes:
list_concat_unique: list_concat_unique:
- get_param: ControlPlaneStaticRoutes - get_param: ControlPlaneStaticRoutes
- - ip_netmask: 169.254.169.254/32 - - default: true
next_hop:
get_param: EC2MetadataIp
- default: true
next_hop: next_hop:
get_param: ControlPlaneDefaultRoute get_param: ControlPlaneDefaultRoute
- type: interface - type: interface

View File

@ -71,11 +71,7 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig
@ -106,11 +102,7 @@ resources:
routes: routes:
list_concat_unique: list_concat_unique:
- get_param: ControlPlaneStaticRoutes - get_param: ControlPlaneStaticRoutes
- - ip_netmask: 169.254.169.254/32 - - default: true # NOTE(hjensas): This is the IPv4 default route
next_hop:
get_param: EC2MetadataIp
# IPv4 Default Route
- default: true # NOTE(hjensas): This is the IPv4 default route
next_hop: next_hop:
get_param: ControlPlaneDefaultRoute get_param: ControlPlaneDefaultRoute
- type: interface - type: interface

View File

@ -85,11 +85,6 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
{%- if role.name == 'ComputeOvsDpdk' %} {%- if role.name == 'ComputeOvsDpdk' %}
NumDpdkInterfaceRxQueues: NumDpdkInterfaceRxQueues:
description: Number of Rx Queues required for DPDK bond or DPDK ports description: Number of Rx Queues required for DPDK bond or DPDK ports
@ -126,11 +121,8 @@ resources:
routes: routes:
list_concat_unique: list_concat_unique:
- get_param: ControlPlaneStaticRoutes - get_param: ControlPlaneStaticRoutes
- - ip_netmask: 169.254.169.254/32
next_hop:
get_param: EC2MetadataIp
{%- if role.default_route_networks is not defined or 'ControlPlane' in role.default_route_networks %} {%- if role.default_route_networks is not defined or 'ControlPlane' in role.default_route_networks %}
- default: true - - default: true
next_hop: next_hop:
get_param: ControlPlaneDefaultRoute get_param: ControlPlaneDefaultRoute
{%- endif %} {%- endif %}

View File

@ -71,11 +71,7 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
MinViableMtu: MinViableMtu:
@ -124,10 +120,7 @@ resources:
routes: routes:
list_concat_unique: list_concat_unique:
- get_param: ControlPlaneStaticRoutes - get_param: ControlPlaneStaticRoutes
- - ip_netmask: 169.254.169.254/32 - - default: true # NOTE(hjensas): This is the IPv4 default route
next_hop:
get_param: EC2MetadataIp
- default: true # NOTE(hjensas): This is the IPv4 default route
next_hop: next_hop:
get_param: ControlPlaneDefaultRoute get_param: ControlPlaneDefaultRoute
members: members:

View File

@ -83,11 +83,7 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
MinViableMtu: MinViableMtu:
@ -140,11 +136,8 @@ resources:
routes: routes:
list_concat_unique: list_concat_unique:
- get_param: ControlPlaneStaticRoutes - get_param: ControlPlaneStaticRoutes
- - ip_netmask: 169.254.169.254/32
next_hop:
get_param: EC2MetadataIp
{%- if role.default_route_networks is not defined or 'ControlPlane' in role.default_route_networks %} {%- if role.default_route_networks is not defined or 'ControlPlane' in role.default_route_networks %}
- default: true - - default: true
next_hop: next_hop:
get_param: ControlPlaneDefaultRoute get_param: ControlPlaneDefaultRoute
{%- endif %} {%- endif %}

View File

@ -74,11 +74,7 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig
@ -107,10 +103,7 @@ resources:
routes: routes:
list_concat_unique: list_concat_unique:
- get_param: ControlPlaneStaticRoutes - get_param: ControlPlaneStaticRoutes
- - ip_netmask: 169.254.169.254/32 - - default: true
next_hop:
get_param: EC2MetadataIp
- default: true
next_hop: next_hop:
get_param: ControlPlaneDefaultRoute get_param: ControlPlaneDefaultRoute
members: members:

View File

@ -71,11 +71,7 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
MinViableMtu: MinViableMtu:
@ -124,10 +120,7 @@ resources:
routes: routes:
list_concat_unique: list_concat_unique:
- get_param: ControlPlaneStaticRoutes - get_param: ControlPlaneStaticRoutes
- - ip_netmask: 169.254.169.254/32 - - default: true # NOTE(hjensas): This is the IPv4 default route
next_hop:
get_param: EC2MetadataIp
- default: true # NOTE(hjensas): This is the IPv4 default route
next_hop: next_hop:
get_param: ControlPlaneDefaultRoute get_param: ControlPlaneDefaultRoute
members: members:

View File

@ -83,11 +83,7 @@ parameters:
default: [] default: []
description: A list of DNS search domains to be added (in order) to resolv.conf. description: A list of DNS search domains to be added (in order) to resolv.conf.
type: comma_delimited_list type: comma_delimited_list
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
resources: resources:
MinViableMtu: MinViableMtu:
@ -140,11 +136,8 @@ resources:
routes: routes:
list_concat_unique: list_concat_unique:
- get_param: ControlPlaneStaticRoutes - get_param: ControlPlaneStaticRoutes
- - ip_netmask: 169.254.169.254/32
next_hop:
get_param: EC2MetadataIp
{%- if role.default_route_networks is not defined or 'ControlPlane' in role.default_route_networks %} {%- if role.default_route_networks is not defined or 'ControlPlane' in role.default_route_networks %}
- default: true - - default: true
next_hop: next_hop:
get_param: ControlPlaneDefaultRoute get_param: ControlPlaneDefaultRoute
{%- endif %} {%- endif %}

View File

@ -257,11 +257,6 @@ parameters:
Unless the default is changed, the parameter is automatically resolved Unless the default is changed, the parameter is automatically resolved
from the subnet host_routes attribute. from the subnet host_routes attribute.
type: json type: json
EC2MetadataIp:
default: ''
description: The IP address of the EC2 metadata server. (The parameter
is automatically resolved from the ctlplane subnet's host_routes attribute.)
type: string
DnsServers: # Override this via parameter_defaults DnsServers: # Override this via parameter_defaults
default: [] default: []
description: > description: >
@ -395,9 +390,6 @@ conditions:
ctlplane_static_routes_set: ctlplane_static_routes_set:
not: not:
equals: [{get_param: ControlPlaneStaticRoutes}, []] equals: [{get_param: ControlPlaneStaticRoutes}, []]
ec2metadaip_set:
not:
equals: [{get_param: EC2MetadataIp}, '']
dnsservers_set: dnsservers_set:
not: not:
equals: [{get_param: DnsServers}, []] equals: [{get_param: DnsServers}, []]
@ -539,15 +531,6 @@ resources:
yaql: yaql:
expression: switch(isInteger($.data) => $.data, true => 1500) expression: switch(isInteger($.data) => $.data, true => 1500)
data: {get_attr: [{{server_resource_name}}, addresses, ctlplane, 0, network, mtu]} data: {get_attr: [{{server_resource_name}}, addresses, ctlplane, 0, network, mtu]}
EC2MetadataIp:
if:
- ec2metadaip_set
- {get_param: EC2MetadataIp}
- yaql:
# NOTE(hjensas): DeployedServer sets the EC2MetadataIp in DeployedServerEnvironment.
# Return an empty string if there are no host_routes in the subnet. (Standalone and Container Undercloud)
expression: switch($.data = null => '', $.data != null => $.data.where($.destination = "169.254.169.254/32").nexthop.first())
data: {get_attr: [{{server_resource_name}}, addresses, ctlplane, 0, subnets, 0, host_routes]}
DnsServers: DnsServers:
if: if:
- dnsservers_set - dnsservers_set

View File

@ -0,0 +1,6 @@
---
other:
- |
The use of parameter ``EC2MetadataIp`` and the configuration of routes to
metadata has been removed. Nothing is consuming metadata over the network
anymore since config-drive is used as the data source.

View File

@ -148,8 +148,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'CephPools': ['description',
# There's one template that defines this # There's one template that defines this
# differently, and I'm not sure if we can # differently, and I'm not sure if we can
# safely change it. # safely change it.
'EC2MetadataIp': ['default'],
# Same as EC2MetadataIp
'ControlPlaneDefaultRoute': ['default'], 'ControlPlaneDefaultRoute': ['default'],
# TODO(bnemec): Address these existing # TODO(bnemec): Address these existing
# inconsistencies. # inconsistencies.