Merge "Add hostname and stack_name tags to ports"
This commit is contained in:
commit
cc797b648b
|
@ -4,6 +4,10 @@ description: >
|
||||||
Returns an IP from a service mapped list of IPs
|
Returns an IP from a service mapped list of IPs
|
||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
|
StackName: # Here for compatibility
|
||||||
|
description: Name of the overcloud heat stack
|
||||||
|
default: overcloud
|
||||||
|
type: string
|
||||||
ServiceName:
|
ServiceName:
|
||||||
description: Name of the service to lookup
|
description: Name of the service to lookup
|
||||||
default: ''
|
default: ''
|
||||||
|
|
|
@ -4,6 +4,10 @@ description: >
|
||||||
Returns an IP from a service mapped list of IPv6 IPs
|
Returns an IP from a service mapped list of IPv6 IPs
|
||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
|
StackName: # Here for compatibility
|
||||||
|
description: Name of the overcloud heat stack
|
||||||
|
default: overcloud
|
||||||
|
type: string
|
||||||
ServiceName:
|
ServiceName:
|
||||||
description: Name of the service to lookup
|
description: Name of the service to lookup
|
||||||
default: ''
|
default: ''
|
||||||
|
|
|
@ -4,6 +4,10 @@ description: >
|
||||||
Returns the control plane port (provisioning network) as the ip_address.
|
Returns the control plane port (provisioning network) as the ip_address.
|
||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
|
StackName: # Here for compatibility
|
||||||
|
description: Name of the overcloud heat stack
|
||||||
|
default: overcloud
|
||||||
|
type: string
|
||||||
ServiceName: # Here for compatibility with from_service.yaml
|
ServiceName: # Here for compatibility with from_service.yaml
|
||||||
description: Name of the service to lookup
|
description: Name of the service to lookup
|
||||||
default: ''
|
default: ''
|
||||||
|
|
|
@ -5,6 +5,10 @@ description: >
|
||||||
automatically if FixedIPs is empty.
|
automatically if FixedIPs is empty.
|
||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
|
StackName:
|
||||||
|
description: Name of the overcloud heat stack
|
||||||
|
default: overcloud
|
||||||
|
type: string
|
||||||
{{network.name}}NetName:
|
{{network.name}}NetName:
|
||||||
description: The name of the {{network.name_lower}} network.
|
description: The name of the {{network.name_lower}} network.
|
||||||
default: {{network.name_lower|default(network.name|lower)}}
|
default: {{network.name_lower|default(network.name|lower)}}
|
||||||
|
@ -81,6 +85,15 @@ resources:
|
||||||
- [{subnet: {get_param: ControlPlaneSubnet}}]
|
- [{subnet: {get_param: ControlPlaneSubnet}}]
|
||||||
- get_param: FixedIPs
|
- get_param: FixedIPs
|
||||||
replacement_policy: AUTO
|
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:
|
outputs:
|
||||||
ip_address:
|
ip_address:
|
||||||
|
|
|
@ -10,6 +10,10 @@ description: >
|
||||||
- 1.2.3.5 # Second controller
|
- 1.2.3.5 # Second controller
|
||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
|
StackName: # Here for compatibility
|
||||||
|
description: Name of the overcloud heat stack
|
||||||
|
default: overcloud
|
||||||
|
type: string
|
||||||
{{network.name}}NetName:
|
{{network.name}}NetName:
|
||||||
description: The name of the {{network.name_lower}} network.
|
description: The name of the {{network.name_lower}} network.
|
||||||
default: {{network.name_lower}}
|
default: {{network.name_lower}}
|
||||||
|
|
|
@ -823,6 +823,7 @@ resources:
|
||||||
resource_def:
|
resource_def:
|
||||||
type: OS::TripleO::{{role.name}}
|
type: OS::TripleO::{{role.name}}
|
||||||
properties:
|
properties:
|
||||||
|
StackName: {get_param: 'OS::stack_name'}
|
||||||
CloudDomain: {get_param: CloudDomain}
|
CloudDomain: {get_param: CloudDomain}
|
||||||
ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
|
ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
|
||||||
EndpointMap: {get_attr: [EndpointMapData, value]}
|
EndpointMap: {get_attr: [EndpointMapData, value]}
|
||||||
|
|
|
@ -5,6 +5,10 @@
|
||||||
heat_template_version: rocky
|
heat_template_version: rocky
|
||||||
description: 'OpenStack {{role.name}} node configured by Puppet'
|
description: 'OpenStack {{role.name}} node configured by Puppet'
|
||||||
parameters:
|
parameters:
|
||||||
|
StackName:
|
||||||
|
description: Name of the overcloud heat stack
|
||||||
|
default: overcloud
|
||||||
|
type: string
|
||||||
{%- set default_flavor_name = role.FlavorDefault|default('baremetal') %}
|
{%- set default_flavor_name = role.FlavorDefault|default('baremetal') %}
|
||||||
{%- if role.deprecated_param_flavor is defined %}
|
{%- if role.deprecated_param_flavor is defined %}
|
||||||
{{role.deprecated_param_flavor}}:
|
{{role.deprecated_param_flavor}}:
|
||||||
|
@ -300,6 +304,7 @@ resources:
|
||||||
{{network.name}}Port:
|
{{network.name}}Port:
|
||||||
type: OS::TripleO::{{role.name}}::Ports::{{network.name}}Port
|
type: OS::TripleO::{{role.name}}::Ports::{{network.name}}Port
|
||||||
properties:
|
properties:
|
||||||
|
StackName: {get_param: StackName}
|
||||||
PortName:
|
PortName:
|
||||||
list_join:
|
list_join:
|
||||||
- '_'
|
- '_'
|
||||||
|
|
Loading…
Reference in New Issue