Browse Source

Merge "Set tags on all OS::Neutron::Port resources" into stable/train

changes/16/794616/1 train-em
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
0a60ff2250
14 changed files with 170 additions and 2 deletions
  1. +8
    -0
      deployed-server/ctlplane-port.yaml
  2. +11
    -0
      deployed-server/deployed-neutron-port.yaml
  3. +8
    -0
      deployed-server/deployed-server.yaml
  4. +15
    -1
      network/ports/ctlplane_vip.yaml
  5. +3
    -0
      network/ports/from_service.yaml
  6. +3
    -0
      network/ports/from_service_v6.yaml
  7. +13
    -0
      network/ports/noop.yaml
  8. +16
    -0
      network/ports/ovn_mac_addr_port.yaml
  9. +39
    -0
      network/ports/port.j2
  10. +13
    -0
      network/ports/port_from_pool.j2
  11. +15
    -0
      network/ports/vip.yaml
  12. +15
    -1
      network/ports/vip_v6.yaml
  13. +7
    -0
      overcloud.j2.yaml
  14. +4
    -0
      puppet/role.role.j2.yaml

+ 8
- 0
deployed-server/ctlplane-port.yaml View File

@ -1,6 +1,9 @@
heat_template_version: rocky
parameters:
RootStackName:
description: The name of the stack/plan.
type: string
network:
type: string
default: ctlplane
@ -30,6 +33,11 @@ resources:
- - {get_param: name}
- port
replacement_policy: AUTO
tags:
- str_replace:
template: tripleo_stack_name=$STACK_NAME
params:
$STACK_NAME: {get_param: RootStackName}
outputs:
fixed_ips:


+ 11
- 0
deployed-server/deployed-neutron-port.yaml View File

@ -30,9 +30,20 @@ parameters:
replacement_policy:
default: ''
type: string
tags:
default: []
type: comma_delimited_list
DeployedServerPortMap:
default: {}
type: json
IsVirtualIP: # Here for compatibility
default: false
type: boolean
Role: # Here for compatibility
description: >
The TripleO Role Name
type: string
default: ''
outputs:


+ 8
- 0
deployed-server/deployed-server.yaml View File

@ -1,5 +1,8 @@
heat_template_version: rocky
parameters:
RootStackName:
description: The name of the stack/plan.
type: string
image:
type: string
default: unused
@ -76,6 +79,11 @@ resources:
- - {get_param: name}
- ctlplane
replacement_policy: AUTO
tags:
- str_replace:
template: tripleo_stack_name=$STACK_NAME
params:
$STACK_NAME: {get_param: RootStackName}
outputs:
OS::stack_id:


+ 15
- 1
network/ports/ctlplane_vip.yaml View File

@ -5,6 +5,9 @@ description: >
The IP address will be chosen automatically if FixedIPs is empty.
parameters:
RootStackName:
description: The name of the stack/plan.
type: string
ServiceName: # Here for compatibility with from_service.yaml
description: Name of the service to lookup
default: ''
@ -41,6 +44,9 @@ parameters:
[{'ip_address':'1.2.3.4'}]
default: []
type: json
IsVirtualIP: # Here for compatibility
type: boolean
default: false
conditions:
fixed_ip_not_set:
@ -62,7 +68,15 @@ resources:
- [{subnet: {get_param: ControlPlaneSubnet}}]
- get_param: FixedIPs
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:
ip_address:
description: Virtual IP network IP


+ 3
- 0
network/ports/from_service.yaml View File

@ -40,6 +40,9 @@ parameters:
[{'ip_address':'1.2.3.4'}]
default: []
type: json
IsVirtualIP: # Here for compatibility
type: boolean
default: false
ServiceVips:
default: {}
type: json


+ 3
- 0
network/ports/from_service_v6.yaml View File

@ -36,6 +36,9 @@ parameters:
[{'ip_address':'1.2.3.4'}]
default: []
type: json
IsVirtualIP: # Here for compatibility
type: boolean
default: false
ServiceVips:
default: {}
type: json


+ 13
- 0
network/ports/noop.yaml View File

@ -53,6 +53,19 @@ parameters:
default: 0
description: Index of the IP to get from Pool
type: number
IsVirtualIP: # Here for compatibility
type: boolean
default: false
DefaultRoute: # Here for compatibility
description: >
Whether this interface is used for the default route
type: boolean
default: false
Role: # Here for compatibility
description: >
The TripleO Role Name
type: string
default: ''
outputs:
ip_address:


+ 16
- 0
network/ports/ovn_mac_addr_port.yaml View File

@ -4,6 +4,9 @@ description: >
Port without IP address, used to allocate MAC addresses for OVN chassis.
parameters:
RootStackName:
description: The name of the stack/plan.
type: string
PortName:
description: Name of the port
default: ''
@ -20,6 +23,19 @@ resources:
name: {get_param: PortName}
network: {get_param: OVNMacAddressNetworkName}
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:
mac_address:


+ 39
- 0
network/ports/port.j2 View File

@ -5,6 +5,9 @@ description: >
automatically if FixedIPs is empty.
parameters:
RootStackName:
description: The name of the stack/plan.
type: string
{{network.name}}NetName:
description: The name of the {{network.name_lower}} network.
default: {{network.name_lower|default(network.name|lower)}}
@ -43,6 +46,19 @@ parameters:
NodeIndex: # Here for compatibility with from_pool.yaml
default: 0
type: number
DefaultRoute:
description: >
Whether this interface is used for the default route
type: boolean
default: false
IsVirtualIP:
type: boolean
default: false
Role:
description: >
The TripleO Role Name
type: string
default: ''
conditions:
network_is_ctlplane:
@ -76,6 +92,29 @@ resources:
- [{subnet: {get_param: ControlPlaneSubnet}}]
- get_param: FixedIPs
replacement_policy: AUTO
tags:
if:
- {get_param: IsVirtualIP}
- - str_replace:
template: tripleo_vip_net=$NET_NAME
params:
$NET_NAME: {get_param: {{network.name}}NetName}
- str_replace:
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}
- str_replace:
template: tripleo_role=$ROLE
params:
$ROLE: {get_param: Role}
outputs:
ip_address:


+ 13
- 0
network/ports/port_from_pool.j2 View File

@ -60,6 +60,19 @@ parameters:
default: ''
description: default route for the {{network.name_lower}} network
type: string
DefaultRoute: # Here for compatibility
description: >
Whether this interface is used for the default route
type: boolean
default: false
IsVirtualIP: # Here for compatibility
default: false
type: boolean
Role: # Here for compatibility
description: >
The TripleO Role Name
type: string
default: ''
conditions:
{{network.name_lower}}_interface_default_route_set:


+ 15
- 0
network/ports/vip.yaml View File

@ -5,6 +5,9 @@ description: >
The IP address will be chosen automatically if FixedIPs is empty.
parameters:
RootStackName:
description: The name of the stack/plan.
type: string
ServiceName: # Here for compatibility with from_service.yaml
description: Name of the service to lookup
default: ''
@ -41,6 +44,9 @@ parameters:
[{'ip_address':'1.2.3.4'}]
default: []
type: json
IsVirtualIP: # Here for compatibility
type: boolean
default: false
conditions:
network_is_ctlplane:
@ -70,6 +76,15 @@ resources:
- [{subnet: {get_param: ControlPlaneSubnet}}]
- get_param: FixedIPs
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:
ip_address:


+ 15
- 1
network/ports/vip_v6.yaml View File

@ -5,6 +5,9 @@ description: >
The IP address will be chosen automatically if FixedIPs is empty.
parameters:
RootStackName:
description: The name of the stack/plan.
type: string
ServiceName: # Here for compatibility with from_service.yaml
description: Name of the service to lookup
default: ''
@ -41,6 +44,9 @@ parameters:
[{'ip_address':'1.2.3.4'}]
default: []
type: json
IsVirtualIP: # Here for compatibility
type: boolean
default: false
conditions:
network_is_ctlplane:
@ -70,7 +76,15 @@ resources:
- [{subnet: {get_param: ControlPlaneSubnet}}]
- get_param: FixedIPs
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:
ip_address:
description: Virtual IP network IP


+ 7
- 0
overcloud.j2.yaml View File

@ -920,6 +920,12 @@ resources:
- [{subnet: {get_attr: [ServiceNetMap, vip_subnet_map, ctlplane]}}]
- get_param: ControlFixedIPs
replacement_policy: AUTO
tags:
- tripleo_vip_net=ctlplane
- str_replace:
template: tripleo_stack_name=$STACK_NAME
params:
$STACK_NAME: {get_param: 'OS::stack_name'}
RedisVirtualIP:
depends_on: [Networks, ServiceNetMap]
@ -998,6 +1004,7 @@ resources:
- {{network.name_lower}}_virtual_fixed_ip_set
- {get_param: {{network.name}}VirtualFixedIPs}
- [{subnet: {get_attr: [ServiceNetMap, vip_subnet_map, {{network.name}}]}}]
IsVirtualIP: true
{% endif %}
{%- endfor %}


+ 4
- 0
puppet/role.role.j2.yaml View File

@ -408,6 +408,10 @@ resources:
{%- endif %}
- {get_param: {{role.name}}IPs}
NodeIndex: {get_param: NodeIndex}
{%- if role.default_route_networks is defined and network.name in role.default_route_networks %}
DefaultRoute: true
{%- endif %}
Role: {{role.name}}
{%- endif %}
{%- endfor %}


Loading…
Cancel
Save