Set tags on all OS::Neutron::Port resources
Set up tag hints on all OS::Neutron::Port resources. The network-data-v2 work uses tags on neutron resources to find existing resources so that we update instead of create. Also for generating environment files info in the neutron tag field is utilized. Partial-Implements: blueprint network-data-v2-ports Change-Id: I3d43ae22cc45e5528ecfb1a6b2cb8602faa162a0
This commit is contained in:
parent
e48eef930a
commit
73684d0a89
|
@ -1,6 +1,9 @@
|
||||||
heat_template_version: wallaby
|
heat_template_version: wallaby
|
||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
|
RootStackName:
|
||||||
|
description: The name of the stack/plan.
|
||||||
|
type: string
|
||||||
network:
|
network:
|
||||||
type: string
|
type: string
|
||||||
default: ctlplane
|
default: ctlplane
|
||||||
|
@ -33,6 +36,11 @@ resources:
|
||||||
- - {get_param: name}
|
- - {get_param: name}
|
||||||
- port
|
- port
|
||||||
replacement_policy: AUTO
|
replacement_policy: AUTO
|
||||||
|
tags:
|
||||||
|
- str_replace:
|
||||||
|
template: tripleo_stack_name=$STACK_NAME
|
||||||
|
params:
|
||||||
|
$STACK_NAME: {get_param: RootStackName}
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
fixed_ips:
|
fixed_ips:
|
||||||
|
|
|
@ -39,6 +39,9 @@ parameters:
|
||||||
DeployedServerPortMap:
|
DeployedServerPortMap:
|
||||||
default: {}
|
default: {}
|
||||||
type: json
|
type: json
|
||||||
|
IsVirtualIP: # Here for compatibility
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
|
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
heat_template_version: wallaby
|
heat_template_version: wallaby
|
||||||
parameters:
|
parameters:
|
||||||
|
RootStackName:
|
||||||
|
description: The name of the stack/plan.
|
||||||
|
type: string
|
||||||
image:
|
image:
|
||||||
type: string
|
type: string
|
||||||
default: unused
|
default: unused
|
||||||
|
@ -76,6 +79,11 @@ resources:
|
||||||
- - {get_param: name}
|
- - {get_param: name}
|
||||||
- ctlplane
|
- ctlplane
|
||||||
replacement_policy: AUTO
|
replacement_policy: AUTO
|
||||||
|
tags:
|
||||||
|
- str_replace:
|
||||||
|
template: tripleo_stack_name=$STACK_NAME
|
||||||
|
params:
|
||||||
|
$STACK_NAME: {get_param: RootStackName}
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
OS::stack_id:
|
OS::stack_id:
|
||||||
|
|
|
@ -5,6 +5,9 @@ description: >
|
||||||
The IP address will be chosen automatically if FixedIPs is empty.
|
The IP address will be chosen automatically if FixedIPs is empty.
|
||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
|
RootStackName:
|
||||||
|
description: The name of the stack/plan.
|
||||||
|
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: ''
|
||||||
|
@ -45,6 +48,9 @@ parameters:
|
||||||
[{'ip_address':'1.2.3.4'}]
|
[{'ip_address':'1.2.3.4'}]
|
||||||
default: []
|
default: []
|
||||||
type: json
|
type: json
|
||||||
|
IsVirtualIP: # Here for compatibility
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
|
|
||||||
conditions:
|
conditions:
|
||||||
fixed_ip_not_set:
|
fixed_ip_not_set:
|
||||||
|
@ -67,7 +73,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: tripleo_vip_net=$NET_NAME
|
||||||
|
params:
|
||||||
|
$NET_NAME: {get_param: ControlPlaneNetwork}
|
||||||
|
- str_replace:
|
||||||
|
template: tripleo_stack_name=$STACK_NAME
|
||||||
|
params:
|
||||||
|
$STACK_NAME: {get_param: RootStackName}
|
||||||
outputs:
|
outputs:
|
||||||
ip_address:
|
ip_address:
|
||||||
description: Virtual IP network IP
|
description: Virtual IP network IP
|
||||||
|
|
|
@ -51,6 +51,9 @@ parameters:
|
||||||
A map of deployed port data
|
A map of deployed port data
|
||||||
default: {}
|
default: {}
|
||||||
type: json
|
type: json
|
||||||
|
IsVirtualIP: # Here for compatibility
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@ parameters:
|
||||||
NodeIndex: # Here for compatibility with from_pool.yaml
|
NodeIndex: # Here for compatibility with from_pool.yaml
|
||||||
default: 0
|
default: 0
|
||||||
type: number
|
type: number
|
||||||
VipPort: # Here for compatibility
|
IsVirtualIP: # Here for compatibility
|
||||||
type: boolean
|
type: boolean
|
||||||
default: false
|
default: false
|
||||||
VipPortMap:
|
VipPortMap:
|
||||||
|
|
|
@ -44,6 +44,9 @@ parameters:
|
||||||
[{'ip_address':'1.2.3.4'}]
|
[{'ip_address':'1.2.3.4'}]
|
||||||
default: []
|
default: []
|
||||||
type: json
|
type: json
|
||||||
|
IsVirtualIP: # Here for compatibility
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
ServiceVips:
|
ServiceVips:
|
||||||
default: {}
|
default: {}
|
||||||
type: json
|
type: json
|
||||||
|
|
|
@ -40,6 +40,9 @@ parameters:
|
||||||
[{'ip_address':'1.2.3.4'}]
|
[{'ip_address':'1.2.3.4'}]
|
||||||
default: []
|
default: []
|
||||||
type: json
|
type: json
|
||||||
|
IsVirtualIP: # Here for compatibility
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
ServiceVips:
|
ServiceVips:
|
||||||
default: {}
|
default: {}
|
||||||
type: json
|
type: json
|
||||||
|
|
|
@ -57,6 +57,9 @@ parameters:
|
||||||
default: 0
|
default: 0
|
||||||
description: Index of the IP to get from Pool
|
description: Index of the IP to get from Pool
|
||||||
type: number
|
type: number
|
||||||
|
IsVirtualIP: # Here for compatibility
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
ip_address:
|
ip_address:
|
||||||
|
|
|
@ -4,6 +4,9 @@ description: >
|
||||||
Port without IP address, used to allocate MAC addresses for OVN chassis.
|
Port without IP address, used to allocate MAC addresses for OVN chassis.
|
||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
|
RootStackName:
|
||||||
|
description: The name of the stack/plan.
|
||||||
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
description: Name of the port
|
description: Name of the port
|
||||||
default: ''
|
default: ''
|
||||||
|
@ -29,6 +32,19 @@ resources:
|
||||||
name: {get_param: PortName}
|
name: {get_param: PortName}
|
||||||
network: {get_param: OVNMacAddressNetworkName}
|
network: {get_param: OVNMacAddressNetworkName}
|
||||||
fixed_ips: []
|
fixed_ips: []
|
||||||
|
tags:
|
||||||
|
- str_replace:
|
||||||
|
template: tripleo_ovn_mac_port_name=$PORT_NAME
|
||||||
|
params:
|
||||||
|
$PORT_NAME: {get_param: PortName}
|
||||||
|
- str_replace:
|
||||||
|
template: tripleo_ovn_mac_net=$NET_NAME
|
||||||
|
params:
|
||||||
|
$NET_NAME: {get_param: OVNMacAddressNetworkName}
|
||||||
|
- str_replace:
|
||||||
|
template: tripleo_stack_name=$STACK_NAME
|
||||||
|
params:
|
||||||
|
$STACK_NAME: {get_param: RootStackName}
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
mac_address:
|
mac_address:
|
||||||
|
|
|
@ -63,6 +63,9 @@ parameters:
|
||||||
Whether this interface is used for the default route
|
Whether this interface is used for the default route
|
||||||
type: boolean
|
type: boolean
|
||||||
default: false
|
default: false
|
||||||
|
IsVirtualIP:
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
|
|
||||||
conditions:
|
conditions:
|
||||||
network_is_ctlplane:
|
network_is_ctlplane:
|
||||||
|
@ -99,14 +102,24 @@ resources:
|
||||||
- get_param: FixedIPs
|
- get_param: FixedIPs
|
||||||
replacement_policy: AUTO
|
replacement_policy: AUTO
|
||||||
tags:
|
tags:
|
||||||
- str_replace:
|
if:
|
||||||
template: tripleo_stack_name=$STACK_NAME
|
- {get_param: IsVirtualIP}
|
||||||
params:
|
- - str_replace:
|
||||||
$STACK_NAME: {get_param: RootStackName}
|
template: tripleo_vip_net=$NET_NAME
|
||||||
- str_replace:
|
params:
|
||||||
template: tripleo_default_route=$BOOL
|
$NET_NAME: {get_param: {{network.name}}NetName}
|
||||||
params:
|
- str_replace:
|
||||||
$BOOL: {get_param: DefaultRoute}
|
template: tripleo_stack_name=$STACK_NAME
|
||||||
|
params:
|
||||||
|
$STACK_NAME: {get_param: RootStackName}
|
||||||
|
- - str_replace:
|
||||||
|
template: tripleo_stack_name=$STACK_NAME
|
||||||
|
params:
|
||||||
|
$STACK_NAME: {get_param: RootStackName}
|
||||||
|
- str_replace:
|
||||||
|
template: tripleo_default_route=$BOOL
|
||||||
|
params:
|
||||||
|
$BOOL: {get_param: DefaultRoute}
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
ip_address:
|
ip_address:
|
||||||
|
|
|
@ -65,6 +65,9 @@ parameters:
|
||||||
Whether this interface is used for the default route
|
Whether this interface is used for the default route
|
||||||
type: boolean
|
type: boolean
|
||||||
default: false
|
default: false
|
||||||
|
IsVirtualIP: # Here for compatibility
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
ip_address:
|
ip_address:
|
||||||
|
|
|
@ -5,6 +5,9 @@ description: >
|
||||||
The IP address will be chosen automatically if FixedIPs is empty.
|
The IP address will be chosen automatically if FixedIPs is empty.
|
||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
|
RootStackName:
|
||||||
|
description: The name of the stack/plan.
|
||||||
|
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: ''
|
||||||
|
@ -53,6 +56,9 @@ parameters:
|
||||||
default: delete
|
default: delete
|
||||||
constraints:
|
constraints:
|
||||||
- allowed_values: [delete, retain]
|
- allowed_values: [delete, retain]
|
||||||
|
IsVirtualIP: # Here for compatibility
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
|
|
||||||
conditions:
|
conditions:
|
||||||
network_is_ctlplane:
|
network_is_ctlplane:
|
||||||
|
@ -83,6 +89,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: tripleo_service_vip=$SERVICE_NAME
|
||||||
|
params:
|
||||||
|
$SERVICE_NAME: {get_param: ServiceName}
|
||||||
|
- str_replace:
|
||||||
|
template: tripleo_stack_name=$STACK_NAME
|
||||||
|
params:
|
||||||
|
$STACK_NAME: {get_param: RootStackName}
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
ip_address:
|
ip_address:
|
||||||
|
|
|
@ -5,6 +5,9 @@ description: >
|
||||||
The IP address will be chosen automatically if FixedIPs is empty.
|
The IP address will be chosen automatically if FixedIPs is empty.
|
||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
|
RootStackName:
|
||||||
|
description: The name of the stack/plan.
|
||||||
|
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: ''
|
||||||
|
@ -45,6 +48,9 @@ parameters:
|
||||||
[{'ip_address':'1.2.3.4'}]
|
[{'ip_address':'1.2.3.4'}]
|
||||||
default: []
|
default: []
|
||||||
type: json
|
type: json
|
||||||
|
IsVirtualIP: # Here for compatibility
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
|
|
||||||
conditions:
|
conditions:
|
||||||
network_is_ctlplane:
|
network_is_ctlplane:
|
||||||
|
@ -74,7 +80,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: tripleo_service_vip=$SERVICE_NAME
|
||||||
|
params:
|
||||||
|
$SERVICE_NAME: {get_param: ServiceName}
|
||||||
|
- str_replace:
|
||||||
|
template: tripleo_stack_name=$STACK_NAME
|
||||||
|
params:
|
||||||
|
$STACK_NAME: {get_param: RootStackName}
|
||||||
outputs:
|
outputs:
|
||||||
ip_address:
|
ip_address:
|
||||||
description: Virtual IP network IP
|
description: Virtual IP network IP
|
||||||
|
|
|
@ -1176,6 +1176,7 @@ resources:
|
||||||
- {get_param: {{network.name}}VirtualFixedIPs}
|
- {get_param: {{network.name}}VirtualFixedIPs}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
- [{subnet: {get_attr: [ServiceNetMap, vip_subnet_map, {{network.name}}]}}]
|
- [{subnet: {get_attr: [ServiceNetMap, vip_subnet_map, {{network.name}}]}}]
|
||||||
|
IsVirtualIP: true
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
|
|
||||||
VipMap:
|
VipMap:
|
||||||
|
|
Loading…
Reference in New Issue