Introduce Puppet variables for primary and secondary pool addresses.
This change create classes to receive the network addresses per family as they will be generated by sysinv based on the pools associated with the network. The current classes will be filled with the primary pool addresses, to be used by manifests that don't have a preferred protocol address family. Test Plan: [PASS] AIO-SX, Standard installation (IPv4 and IPv6) - using the dependency change the secondary pool was introduced - system was lock/unlocked and no puppet manifests were detected - inspection of system.yaml and controller-0.yaml to verify variables content - no alarms or disabled services were found [PASS] For standard systems during upgrade, simulate node unlock by: - Clearing the "network_addresspools" table after Ansible execution and before DM configuration. - Installing remaining nodes with the table empty. This mimics the post-upgrade scenario. Story: 2011027 Task: 49680 Depends-On: https://review.opendev.org/c/starlingx/config/+/911114 Change-Id: I1520e620fc51d339ba80efd2c43e10bb715f78c5 Signed-off-by: Andre Kantek <andrefernandozanella.kantek@windriver.com>
This commit is contained in:
parent
8f4a787df0
commit
90a231f2bd
|
@ -1,4 +1,40 @@
|
|||
|
||||
class platform::network::pxeboot::ipv4::params(
|
||||
# shared parameters with base class - required for auto hiera parameter lookup
|
||||
$interface_address = undef,
|
||||
$subnet_version = undef,
|
||||
$subnet_network = undef,
|
||||
$subnet_network_url = undef,
|
||||
$subnet_prefixlen = undef,
|
||||
$subnet_netmask = undef,
|
||||
$subnet_start = undef,
|
||||
$subnet_end = undef,
|
||||
$gateway_address = undef,
|
||||
$controller_address = undef, # controller floating
|
||||
$controller_address_url = undef, # controller floating url address
|
||||
$controller0_address = undef, # controller unit0
|
||||
$controller1_address = undef, # controller unit1
|
||||
) { }
|
||||
|
||||
class platform::network::pxeboot::ipv6::params(
|
||||
# shared parameters with base class - required for auto hiera parameter lookup
|
||||
$interface_address = undef,
|
||||
$subnet_version = undef,
|
||||
$subnet_network = undef,
|
||||
$subnet_network_url = undef,
|
||||
$subnet_prefixlen = undef,
|
||||
$subnet_netmask = undef,
|
||||
$subnet_start = undef,
|
||||
$subnet_end = undef,
|
||||
$gateway_address = undef,
|
||||
$controller_address = undef, # controller floating
|
||||
$controller_address_url = undef, # controller floating url address
|
||||
$controller0_address = undef, # controller unit0
|
||||
$controller1_address = undef, # controller unit1
|
||||
) { }
|
||||
|
||||
class platform::network::pxeboot::params(
|
||||
# this class contains the primary pool (ipv4 or ipv6) addresses for compatibility
|
||||
# shared parameters with base class - required for auto hiera parameter lookup
|
||||
$interface_name = undef,
|
||||
$interface_address = undef,
|
||||
|
@ -18,8 +54,42 @@ class platform::network::pxeboot::params(
|
|||
$mtu = 1500,
|
||||
) { }
|
||||
|
||||
class platform::network::mgmt::ipv4::params(
|
||||
# shared parameters with base class - required for auto hiera parameter lookup
|
||||
$interface_address = undef,
|
||||
$subnet_version = undef,
|
||||
$subnet_network = undef,
|
||||
$subnet_network_url = undef,
|
||||
$subnet_prefixlen = undef,
|
||||
$subnet_netmask = undef,
|
||||
$subnet_start = undef,
|
||||
$subnet_end = undef,
|
||||
$gateway_address = undef,
|
||||
$controller_address = undef, # controller floating
|
||||
$controller_address_url = undef, # controller floating url address
|
||||
$controller0_address = undef, # controller unit0
|
||||
$controller1_address = undef, # controller unit1
|
||||
) { }
|
||||
|
||||
class platform::network::mgmt::ipv6::params(
|
||||
# shared parameters with base class - required for auto hiera parameter lookup
|
||||
$interface_address = undef,
|
||||
$subnet_version = undef,
|
||||
$subnet_network = undef,
|
||||
$subnet_network_url = undef,
|
||||
$subnet_prefixlen = undef,
|
||||
$subnet_netmask = undef,
|
||||
$subnet_start = undef,
|
||||
$subnet_end = undef,
|
||||
$gateway_address = undef,
|
||||
$controller_address = undef, # controller floating
|
||||
$controller_address_url = undef, # controller floating url address
|
||||
$controller0_address = undef, # controller unit0
|
||||
$controller1_address = undef, # controller unit1
|
||||
) { }
|
||||
|
||||
class platform::network::mgmt::params(
|
||||
# this class contains the primary pool (ipv4 or ipv6) addresses for compatibility
|
||||
# shared parameters with base class - required for auto hiera parameter lookup
|
||||
$interface_name = undef,
|
||||
$interface_address = undef,
|
||||
|
@ -43,7 +113,42 @@ class platform::network::mgmt::params(
|
|||
$fqdn_ready = undef,
|
||||
) { }
|
||||
|
||||
class platform::network::oam::ipv4::params(
|
||||
# shared parameters with base class - required for auto hiera parameter lookup
|
||||
$interface_address = undef,
|
||||
$subnet_version = undef,
|
||||
$subnet_network = undef,
|
||||
$subnet_network_url = undef,
|
||||
$subnet_prefixlen = undef,
|
||||
$subnet_netmask = undef,
|
||||
$subnet_start = undef,
|
||||
$subnet_end = undef,
|
||||
$gateway_address = undef,
|
||||
$controller_address = undef, # controller floating
|
||||
$controller_address_url = undef, # controller floating url address
|
||||
$controller0_address = undef, # controller unit0
|
||||
$controller1_address = undef, # controller unit1
|
||||
) { }
|
||||
|
||||
class platform::network::oam::ipv6::params(
|
||||
# shared parameters with base class - required for auto hiera parameter lookup
|
||||
$interface_address = undef,
|
||||
$subnet_version = undef,
|
||||
$subnet_network = undef,
|
||||
$subnet_network_url = undef,
|
||||
$subnet_prefixlen = undef,
|
||||
$subnet_netmask = undef,
|
||||
$subnet_start = undef,
|
||||
$subnet_end = undef,
|
||||
$gateway_address = undef,
|
||||
$controller_address = undef, # controller floating
|
||||
$controller_address_url = undef, # controller floating url address
|
||||
$controller0_address = undef, # controller unit0
|
||||
$controller1_address = undef, # controller unit1
|
||||
) { }
|
||||
|
||||
class platform::network::oam::params(
|
||||
# this class contains the primary pool (ipv4 or ipv6) addresses for compatibility
|
||||
# shared parameters with base class - required for auto hiera parameter lookup
|
||||
$interface_name = undef,
|
||||
$interface_address = undef,
|
||||
|
@ -63,7 +168,42 @@ class platform::network::oam::params(
|
|||
$mtu = 1500,
|
||||
) { }
|
||||
|
||||
class platform::network::cluster_host::ipv4::params(
|
||||
# shared parameters with base class - required for auto hiera parameter lookup
|
||||
$interface_address = undef,
|
||||
$subnet_version = undef,
|
||||
$subnet_network = undef,
|
||||
$subnet_network_url = undef,
|
||||
$subnet_prefixlen = undef,
|
||||
$subnet_netmask = undef,
|
||||
$subnet_start = undef,
|
||||
$subnet_end = undef,
|
||||
$gateway_address = undef,
|
||||
$controller_address = undef, # controller floating
|
||||
$controller_address_url = undef, # controller floating url address
|
||||
$controller0_address = undef, # controller unit0
|
||||
$controller1_address = undef, # controller unit1
|
||||
) { }
|
||||
|
||||
class platform::network::cluster_host::ipv6::params(
|
||||
# shared parameters with base class - required for auto hiera parameter lookup
|
||||
$interface_address = undef,
|
||||
$subnet_version = undef,
|
||||
$subnet_network = undef,
|
||||
$subnet_network_url = undef,
|
||||
$subnet_prefixlen = undef,
|
||||
$subnet_netmask = undef,
|
||||
$subnet_start = undef,
|
||||
$subnet_end = undef,
|
||||
$gateway_address = undef,
|
||||
$controller_address = undef, # controller floating
|
||||
$controller_address_url = undef, # controller floating url address
|
||||
$controller0_address = undef, # controller unit0
|
||||
$controller1_address = undef, # controller unit1
|
||||
) { }
|
||||
|
||||
class platform::network::cluster_host::params(
|
||||
# this class contains the primary pool (ipv4 or ipv6) addresses for compatibility
|
||||
# shared parameters with base class - required for auto hiera parameter lookup
|
||||
$interface_name = undef,
|
||||
$interface_address = undef,
|
||||
|
@ -83,7 +223,42 @@ class platform::network::cluster_host::params(
|
|||
$mtu = 1500,
|
||||
) { }
|
||||
|
||||
class platform::network::ironic::ipv4::params(
|
||||
# shared parameters with base class - required for auto hiera parameter lookup
|
||||
$interface_address = undef,
|
||||
$subnet_version = undef,
|
||||
$subnet_network = undef,
|
||||
$subnet_network_url = undef,
|
||||
$subnet_prefixlen = undef,
|
||||
$subnet_netmask = undef,
|
||||
$subnet_start = undef,
|
||||
$subnet_end = undef,
|
||||
$gateway_address = undef,
|
||||
$controller_address = undef, # controller floating
|
||||
$controller_address_url = undef, # controller floating url address
|
||||
$controller0_address = undef, # controller unit0
|
||||
$controller1_address = undef, # controller unit1
|
||||
) { }
|
||||
|
||||
class platform::network::ironic::ipv6::params(
|
||||
# shared parameters with base class - required for auto hiera parameter lookup
|
||||
$interface_address = undef,
|
||||
$subnet_version = undef,
|
||||
$subnet_network = undef,
|
||||
$subnet_network_url = undef,
|
||||
$subnet_prefixlen = undef,
|
||||
$subnet_netmask = undef,
|
||||
$subnet_start = undef,
|
||||
$subnet_end = undef,
|
||||
$gateway_address = undef,
|
||||
$controller_address = undef, # controller floating
|
||||
$controller_address_url = undef, # controller floating url address
|
||||
$controller0_address = undef, # controller unit0
|
||||
$controller1_address = undef, # controller unit1
|
||||
) { }
|
||||
|
||||
class platform::network::ironic::params(
|
||||
# this class contains the primary pool (ipv4 or ipv6) addresses for compatibility
|
||||
# shared parameters with base class - required for auto hiera parameter lookup
|
||||
$interface_name = undef,
|
||||
$interface_address = undef,
|
||||
|
@ -103,7 +278,42 @@ class platform::network::ironic::params(
|
|||
$mtu = 1500,
|
||||
) { }
|
||||
|
||||
class platform::network::admin::ipv4::params(
|
||||
# shared parameters with base class - required for auto hiera parameter lookup
|
||||
$interface_address = undef,
|
||||
$subnet_version = undef,
|
||||
$subnet_network = undef,
|
||||
$subnet_network_url = undef,
|
||||
$subnet_prefixlen = undef,
|
||||
$subnet_netmask = undef,
|
||||
$subnet_start = undef,
|
||||
$subnet_end = undef,
|
||||
$gateway_address = undef,
|
||||
$controller_address = undef, # controller floating
|
||||
$controller_address_url = undef, # controller floating url address
|
||||
$controller0_address = undef, # controller unit0
|
||||
$controller1_address = undef, # controller unit1
|
||||
) { }
|
||||
|
||||
class platform::network::admin::ipv6::params(
|
||||
# shared parameters with base class - required for auto hiera parameter lookup
|
||||
$interface_address = undef,
|
||||
$subnet_version = undef,
|
||||
$subnet_network = undef,
|
||||
$subnet_network_url = undef,
|
||||
$subnet_prefixlen = undef,
|
||||
$subnet_netmask = undef,
|
||||
$subnet_start = undef,
|
||||
$subnet_end = undef,
|
||||
$gateway_address = undef,
|
||||
$controller_address = undef, # controller floating
|
||||
$controller_address_url = undef, # controller floating url address
|
||||
$controller0_address = undef, # controller unit0
|
||||
$controller1_address = undef, # controller unit1
|
||||
) { }
|
||||
|
||||
class platform::network::admin::params(
|
||||
# this class contains the primary pool (ipv4 or ipv6) addresses for compatibility
|
||||
# shared parameters with base class - required for auto hiera parameter lookup
|
||||
$interface_name = undef,
|
||||
$interface_address = undef,
|
||||
|
|
Loading…
Reference in New Issue