From 28f2a709124f62469acafb64110f755edec82636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Mon, 9 Nov 2020 00:51:38 +0100 Subject: [PATCH] Add hostname and stack_name tags to ports Set tag's with the stack name and the hostname on composable network node ports. The tags will be used by network-data-v2 with port management handled outside of heat. Change-Id: I23c600c1754d463028259a7dc2c6e5538c512ca4 --- network/ports/from_service.yaml | 4 ++++ network/ports/from_service_v6.yaml | 4 ++++ network/ports/noop.yaml | 4 ++++ network/ports/port.j2 | 13 +++++++++++++ network/ports/port_from_pool.j2 | 4 ++++ overcloud.j2.yaml | 1 + puppet/role.role.j2.yaml | 5 +++++ 7 files changed, 35 insertions(+) diff --git a/network/ports/from_service.yaml b/network/ports/from_service.yaml index 2e257a4118..20e0e5d286 100644 --- a/network/ports/from_service.yaml +++ b/network/ports/from_service.yaml @@ -4,6 +4,10 @@ description: > Returns an IP from a service mapped list of IPs parameters: + StackName: # Here for compatibility + description: Name of the overcloud heat stack + default: overcloud + type: string ServiceName: description: Name of the service to lookup default: '' diff --git a/network/ports/from_service_v6.yaml b/network/ports/from_service_v6.yaml index 7b9a29a044..03a6b7da2f 100644 --- a/network/ports/from_service_v6.yaml +++ b/network/ports/from_service_v6.yaml @@ -4,6 +4,10 @@ description: > Returns an IP from a service mapped list of IPv6 IPs parameters: + StackName: # Here for compatibility + description: Name of the overcloud heat stack + default: overcloud + type: string ServiceName: description: Name of the service to lookup default: '' diff --git a/network/ports/noop.yaml b/network/ports/noop.yaml index e3d6a6474a..a9184e48ed 100644 --- a/network/ports/noop.yaml +++ b/network/ports/noop.yaml @@ -4,6 +4,10 @@ description: > Returns the control plane port (provisioning network) as the ip_address. parameters: + StackName: # Here for compatibility + description: Name of the overcloud heat stack + default: overcloud + type: string ServiceName: # Here for compatibility with from_service.yaml description: Name of the service to lookup default: '' diff --git a/network/ports/port.j2 b/network/ports/port.j2 index 0ed3a9120e..fb703b98f4 100644 --- a/network/ports/port.j2 +++ b/network/ports/port.j2 @@ -5,6 +5,10 @@ description: > automatically if FixedIPs is empty. parameters: + StackName: + description: Name of the overcloud heat stack + default: overcloud + type: string {{network.name}}NetName: description: The name of the {{network.name_lower}} network. default: {{network.name_lower|default(network.name|lower)}} @@ -81,6 +85,15 @@ resources: - [{subnet: {get_param: ControlPlaneSubnet}}] - get_param: FixedIPs replacement_policy: AUTO + tags: + - str_replace: + template: hostname=$HOSTNAME + params: + $HOSTNAME: {get_param: DnsName} + - str_replace: + template: stack_name=$STACK_NAME + params: + $STACK_NAME: {get_param: StackName} outputs: ip_address: diff --git a/network/ports/port_from_pool.j2 b/network/ports/port_from_pool.j2 index 748eba64f4..0d15d6b9b1 100644 --- a/network/ports/port_from_pool.j2 +++ b/network/ports/port_from_pool.j2 @@ -10,6 +10,10 @@ description: > - 1.2.3.5 # Second controller parameters: + StackName: # Here for compatibility + description: Name of the overcloud heat stack + default: overcloud + type: string {{network.name}}NetName: description: The name of the {{network.name_lower}} network. default: {{network.name_lower}} diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index 7ab9d4f5bb..f95ea118a6 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -823,6 +823,7 @@ resources: resource_def: type: OS::TripleO::{{role.name}} properties: + StackName: {get_param: 'OS::stack_name'} CloudDomain: {get_param: CloudDomain} ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]} EndpointMap: {get_attr: [EndpointMapData, value]} diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml index 9d627a5476..767b14de32 100644 --- a/puppet/role.role.j2.yaml +++ b/puppet/role.role.j2.yaml @@ -5,6 +5,10 @@ heat_template_version: rocky description: 'OpenStack {{role.name}} node configured by Puppet' parameters: + StackName: + description: Name of the overcloud heat stack + default: overcloud + type: string {%- set default_flavor_name = role.FlavorDefault|default('baremetal') %} {%- if role.deprecated_param_flavor is defined %} {{role.deprecated_param_flavor}}: @@ -300,6 +304,7 @@ resources: {{network.name}}Port: type: OS::TripleO::{{role.name}}::Ports::{{network.name}}Port properties: + StackName: {get_param: StackName} PortName: list_join: - '_'