Merge "Create OVNMacAddrNet network on Undercloud" into stable/ussuri
This commit is contained in:
commit
87c763fec3
|
@ -47,6 +47,8 @@ parameter_defaults:
|
||||||
SwiftReplicas: 1
|
SwiftReplicas: 1
|
||||||
|
|
||||||
resource_registry:
|
resource_registry:
|
||||||
|
OS::TripleO::OVNMacAddressNetwork: OS::Heat::None
|
||||||
|
OS::TripleO::OVNMacAddressPort: OS::Heat::None
|
||||||
OS::TripleO::Services::AodhApi: OS::Heat::None
|
OS::TripleO::Services::AodhApi: OS::Heat::None
|
||||||
OS::TripleO::Services::AodhEvaluator: OS::Heat::None
|
OS::TripleO::Services::AodhEvaluator: OS::Heat::None
|
||||||
OS::TripleO::Services::AodhListener: OS::Heat::None
|
OS::TripleO::Services::AodhListener: OS::Heat::None
|
||||||
|
|
|
@ -56,6 +56,8 @@ resource_registry:
|
||||||
OS::TripleO::Network::Ports::ControlPlaneVipPort: ../../deployed-server/deployed-neutron-port.yaml
|
OS::TripleO::Network::Ports::ControlPlaneVipPort: ../../deployed-server/deployed-neutron-port.yaml
|
||||||
OS::TripleO::Network::Ports::OVNDBsVipPort: ../../network/ports/noop.yaml
|
OS::TripleO::Network::Ports::OVNDBsVipPort: ../../network/ports/noop.yaml
|
||||||
OS::TripleO::Network::Ports::RedisVipPort: ../../network/ports/noop.yaml
|
OS::TripleO::Network::Ports::RedisVipPort: ../../network/ports/noop.yaml
|
||||||
|
OS::TripleO::OVNMacAddressNetwork: OS::Heat::None
|
||||||
|
OS::TripleO::OVNMacAddressPort: OS::Heat::None
|
||||||
OS::TripleO::Services::AodhApi: OS::Heat::None
|
OS::TripleO::Services::AodhApi: OS::Heat::None
|
||||||
OS::TripleO::Services::AodhEvaluator: OS::Heat::None
|
OS::TripleO::Services::AodhEvaluator: OS::Heat::None
|
||||||
OS::TripleO::Services::AodhListener: OS::Heat::None
|
OS::TripleO::Services::AodhListener: OS::Heat::None
|
||||||
|
|
|
@ -65,6 +65,10 @@ resource_registry:
|
||||||
# Undercloud HA services
|
# Undercloud HA services
|
||||||
OS::TripleO::Services::HAproxy: OS::Heat::None
|
OS::TripleO::Services::HAproxy: OS::Heat::None
|
||||||
|
|
||||||
|
# Don't create OVN Chassis MAC address nets/ports on the undercloud
|
||||||
|
OS::TripleO::OVNMacAddressNetwork: OS::Heat::None
|
||||||
|
OS::TripleO::OVNMacAddressPort: OS::Heat::None
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
# ensure we enable ip_forward before docker gets run
|
# ensure we enable ip_forward before docker gets run
|
||||||
KernelIpForward: 1
|
KernelIpForward: 1
|
||||||
|
|
|
@ -106,6 +106,8 @@ parameter_defaults:
|
||||||
|
|
||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Network::Ports::ControlPlaneVipPort: OS::Heat::None
|
OS::TripleO::Network::Ports::ControlPlaneVipPort: OS::Heat::None
|
||||||
|
OS::TripleO::OVNMacAddressNetwork: OS::Heat::None
|
||||||
|
OS::TripleO::OVNMacAddressPort: OS::Heat::None
|
||||||
OS::TripleO::Services::AodhApi: OS::Heat::None
|
OS::TripleO::Services::AodhApi: OS::Heat::None
|
||||||
OS::TripleO::Services::AodhEvaluator: OS::Heat::None
|
OS::TripleO::Services::AodhEvaluator: OS::Heat::None
|
||||||
OS::TripleO::Services::AodhListener: OS::Heat::None
|
OS::TripleO::Services::AodhListener: OS::Heat::None
|
||||||
|
|
|
@ -14,6 +14,9 @@ resources:
|
||||||
type: OS::TripleO::Network::{{network.name}}
|
type: OS::TripleO::Network::{{network.name}}
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
|
|
||||||
|
OVNMacAddressNetwork:
|
||||||
|
type: OS::TripleO::OVNMacAddressNetwork
|
||||||
|
|
||||||
NetworkExtraConfig:
|
NetworkExtraConfig:
|
||||||
type: OS::TripleO::Network::ExtraConfig
|
type: OS::TripleO::Network::ExtraConfig
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,37 @@
|
||||||
|
heat_template_version: rocky
|
||||||
|
|
||||||
|
description: Network used to allocate MAC addresses for OVN chassis.
|
||||||
|
|
||||||
|
parameters:
|
||||||
|
OVNMacAddressNetworkName:
|
||||||
|
default: ovn_mac_addr_net
|
||||||
|
description: The name of the OVNMacAddr network.
|
||||||
|
type: string
|
||||||
|
ManageNetworks:
|
||||||
|
default: true
|
||||||
|
type: boolean
|
||||||
|
description: >
|
||||||
|
Manage the network and related resources (subnets and segments) with
|
||||||
|
either create, update, or delete operations (depending on the stack
|
||||||
|
operation). Does not apply to ports which will always be managed as
|
||||||
|
needed. Defaults to true. For multi-stack use cases where the network
|
||||||
|
related resources have already been managed by a separate stack, this
|
||||||
|
parameter can be set to false.
|
||||||
|
|
||||||
|
conditions:
|
||||||
|
manage_networks: {get_param: ManageNetworks}
|
||||||
|
|
||||||
|
resources:
|
||||||
|
OVNMacAddressNetwork:
|
||||||
|
type: OS::Neutron::Net
|
||||||
|
condition: manage_networks
|
||||||
|
properties:
|
||||||
|
name: {get_param: OVNMacAddressNetworkName}
|
||||||
|
value_specs:
|
||||||
|
description: Network used to allocate MAC addresses for OVN chassis.
|
||||||
|
|
||||||
|
outputs:
|
||||||
|
OS::stack_id:
|
||||||
|
description: >
|
||||||
|
Network used to allocate MAC addresses for OVN chassis.
|
||||||
|
value: {get_resource: OVNMacAddressNetwork}
|
|
@ -0,0 +1,27 @@
|
||||||
|
heat_template_version: rocky
|
||||||
|
|
||||||
|
description: >
|
||||||
|
Port without IP address, used to allocate MAC addresses for OVN chassis.
|
||||||
|
|
||||||
|
parameters:
|
||||||
|
PortName:
|
||||||
|
description: Name of the port
|
||||||
|
default: ''
|
||||||
|
type: string
|
||||||
|
OVNMacAddressNetworkName:
|
||||||
|
default: ovn_mac_addr_net
|
||||||
|
description: The name of the OVNMacAddr network.
|
||||||
|
type: string
|
||||||
|
|
||||||
|
resources:
|
||||||
|
OVNMacAddressPort:
|
||||||
|
type: OS::Neutron::Port
|
||||||
|
properties:
|
||||||
|
name: {get_param: PortName}
|
||||||
|
network: {get_param: OVNMacAddressNetworkName}
|
||||||
|
fixed_ips: []
|
||||||
|
|
||||||
|
outputs:
|
||||||
|
mac_address:
|
||||||
|
description: MAC address of the port
|
||||||
|
value: {get_attr: [OVNMacAddressPort, mac_address]}
|
|
@ -68,6 +68,10 @@ resource_registry:
|
||||||
# TripleO overcloud networks
|
# TripleO overcloud networks
|
||||||
OS::TripleO::Network: network/networks.yaml
|
OS::TripleO::Network: network/networks.yaml
|
||||||
|
|
||||||
|
# Special network to allocate unique OVN chassis mac addresses, for distributed vlan traffic.
|
||||||
|
OS::TripleO::OVNMacAddressNetwork: network/ovn_mac_addr_net.yaml
|
||||||
|
OS::TripleO::OVNMacAddressPort: network/ports/ovn_mac_addr_port.yaml
|
||||||
|
|
||||||
{%- for network in networks if network.enabled|default(true) %}
|
{%- for network in networks if network.enabled|default(true) %}
|
||||||
OS::TripleO::Network::{{network.name}}: OS::Heat::None
|
OS::TripleO::Network::{{network.name}}: OS::Heat::None
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
|
|
|
@ -140,6 +140,9 @@ environments:
|
||||||
OS::TripleO::Services::SaharaEngine: OS::Heat::None
|
OS::TripleO::Services::SaharaEngine: OS::Heat::None
|
||||||
# Zaqar
|
# Zaqar
|
||||||
OS::TripleO::Services::Zaqar: OS::Heat::None
|
OS::TripleO::Services::Zaqar: OS::Heat::None
|
||||||
|
# Don't create OVN Chassis MAC address nets/ports on the standalone
|
||||||
|
OS::TripleO::OVNMacAddressNetwork: OS::Heat::None
|
||||||
|
OS::TripleO::OVNMacAddressPort: OS::Heat::None
|
||||||
|
|
||||||
-
|
-
|
||||||
name: standalone/standalone-overcloud
|
name: standalone/standalone-overcloud
|
||||||
|
@ -186,6 +189,10 @@ environments:
|
||||||
|
|
||||||
OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-ansible.yaml
|
OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-ansible.yaml
|
||||||
|
|
||||||
|
# Don't create OVN Chassis MAC address nets/ports on the standalone
|
||||||
|
OS::TripleO::OVNMacAddressNetwork: OS::Heat::None
|
||||||
|
OS::TripleO::OVNMacAddressPort: OS::Heat::None
|
||||||
|
|
||||||
# Aodh
|
# Aodh
|
||||||
OS::TripleO::Services::AodhApi: OS::Heat::None
|
OS::TripleO::Services::AodhApi: OS::Heat::None
|
||||||
OS::TripleO::Services::AodhEvaluator: OS::Heat::None
|
OS::TripleO::Services::AodhEvaluator: OS::Heat::None
|
||||||
|
|
|
@ -94,6 +94,10 @@ environments:
|
||||||
# Disable by default
|
# Disable by default
|
||||||
OS::TripleO::Services::IronicConductor: OS::Heat::None
|
OS::TripleO::Services::IronicConductor: OS::Heat::None
|
||||||
|
|
||||||
|
# Don't create OVN Chassis MAC address nets/ports on the standalone
|
||||||
|
OS::TripleO::OVNMacAddressNetwork: OS::Heat::None
|
||||||
|
OS::TripleO::OVNMacAddressPort: OS::Heat::None
|
||||||
|
|
||||||
# Disable all the services not used when deploying just a minion
|
# Disable all the services not used when deploying just a minion
|
||||||
OS::TripleO::Services::AodhApi: OS::Heat::None
|
OS::TripleO::Services::AodhApi: OS::Heat::None
|
||||||
OS::TripleO::Services::AodhEvaluator: OS::Heat::None
|
OS::TripleO::Services::AodhEvaluator: OS::Heat::None
|
||||||
|
@ -277,4 +281,4 @@ environments:
|
||||||
OS::TripleO::Services::Vpp: OS::Heat::None
|
OS::TripleO::Services::Vpp: OS::Heat::None
|
||||||
OS::TripleO::Services::VRTSHyperScale: OS::Heat::None
|
OS::TripleO::Services::VRTSHyperScale: OS::Heat::None
|
||||||
OS::TripleO::Services::Xinetd: OS::Heat::None
|
OS::TripleO::Services::Xinetd: OS::Heat::None
|
||||||
OS::TripleO::Services::Zaqar: OS::Heat::None
|
OS::TripleO::Services::Zaqar: OS::Heat::None
|
Loading…
Reference in New Issue