Removal of infrastructure network code
* Removed table iinfra and its CLI and api commands * Removed infrastructure_interface from /etc/platform/platform.conf * Removed the infrastructure code in config_controller * Updated tox unit tests Tests performed on AIO-SX, AIO-DX, Standard 2+2 and Standard 2+2+2 Tested using Ansible playbook on AIO-SX. Story: 2004273 Task: 29472 Change-Id: I5162d374f98fa7d74fc9d23fe9e7f85a331a7240 Signed-off-by: Teresa Ho <teresa.ho@windriver.com>
This commit is contained in:
parent
557e424fd7
commit
5b2c5837a6
|
@ -32,16 +32,12 @@ class platform::config::file {
|
||||||
|
|
||||||
include ::platform::params
|
include ::platform::params
|
||||||
include ::platform::network::mgmt::params
|
include ::platform::network::mgmt::params
|
||||||
include ::platform::network::infra::params
|
|
||||||
include ::platform::network::oam::params
|
include ::platform::network::oam::params
|
||||||
include ::platform::network::cluster_host::params
|
include ::platform::network::cluster_host::params
|
||||||
include ::openstack::horizon::params
|
include ::openstack::horizon::params
|
||||||
|
|
||||||
# dependent template variables
|
# dependent template variables
|
||||||
$management_interface = $::platform::network::mgmt::params::interface_name
|
$management_interface = $::platform::network::mgmt::params::interface_name
|
||||||
# TODO: infrastructure_interface will be removed when all the services are
|
|
||||||
# converted to use cluster_host_interface
|
|
||||||
$infrastructure_interface = $::platform::network::cluster_host::params::interface_name
|
|
||||||
$cluster_host_interface = $::platform::network::cluster_host::params::interface_name
|
$cluster_host_interface = $::platform::network::cluster_host::params::interface_name
|
||||||
$oam_interface = $::platform::network::oam::params::interface_name
|
$oam_interface = $::platform::network::oam::params::interface_name
|
||||||
|
|
||||||
|
@ -61,15 +57,6 @@ class platform::config::file {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# TODO: infrastructure_interface will be removed soon
|
|
||||||
if $infrastructure_interface {
|
|
||||||
file_line { "${platform_conf} infrastructure_interface":
|
|
||||||
path => '/etc/platform/platform.conf',
|
|
||||||
line => "infrastructure_interface=${infrastructure_interface}",
|
|
||||||
match => '^infrastructure_interface=',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if $cluster_host_interface {
|
if $cluster_host_interface {
|
||||||
file_line { "${platform_conf} cluster_host_interface":
|
file_line { "${platform_conf} cluster_host_interface":
|
||||||
path => '/etc/platform/platform.conf',
|
path => '/etc/platform/platform.conf',
|
||||||
|
|
|
@ -1,15 +1,10 @@
|
||||||
class platform::dhclient::params (
|
class platform::dhclient::params (
|
||||||
$infra_client_id = undef
|
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
|
|
||||||
class platform::dhclient
|
class platform::dhclient
|
||||||
inherits ::platform::dhclient::params {
|
inherits ::platform::dhclient::params {
|
||||||
|
|
||||||
include ::platform::network::infra::params
|
|
||||||
$infra_interface = $::platform::network::infra::params::interface_name
|
|
||||||
$infra_subnet_version = $::platform::network::infra::params::subnet_version
|
|
||||||
|
|
||||||
file { '/etc/dhcp/dhclient.conf':
|
file { '/etc/dhcp/dhclient.conf':
|
||||||
ensure => 'present',
|
ensure => 'present',
|
||||||
replace => true,
|
replace => true,
|
||||||
|
|
|
@ -35,19 +35,6 @@ class platform::dns::dnsmasq {
|
||||||
$mgmt_subnet_netmask = $::platform::network::mgmt::params::subnet_prefixlen
|
$mgmt_subnet_netmask = $::platform::network::mgmt::params::subnet_prefixlen
|
||||||
}
|
}
|
||||||
|
|
||||||
include ::platform::network::infra::params
|
|
||||||
$infra_interface = $::platform::network::infra::params::interface_name
|
|
||||||
$infra_subnet_version = $::platform::network::infra::params::subnet_version
|
|
||||||
$infra_subnet_start = $::platform::network::infra::params::subnet_start
|
|
||||||
$infra_subnet_end = $::platform::network::infra::params::subnet_end
|
|
||||||
$infra_network_mtu = $::platform::network::infra::params::mtu
|
|
||||||
|
|
||||||
if $infra_subnet_version == 4 {
|
|
||||||
$infra_subnet_netmask = $::platform::network::infra::params::subnet_netmask
|
|
||||||
} else {
|
|
||||||
$infra_subnet_netmask = $::platform::network::infra::params::subnet_prefixlen
|
|
||||||
}
|
|
||||||
|
|
||||||
include ::platform::kubernetes::params
|
include ::platform::kubernetes::params
|
||||||
$service_domain = $::platform::kubernetes::params::service_domain
|
$service_domain = $::platform::kubernetes::params::service_domain
|
||||||
$dns_service_ip = $::platform::kubernetes::params::dns_service_ip
|
$dns_service_ip = $::platform::kubernetes::params::dns_service_ip
|
||||||
|
|
|
@ -14,15 +14,8 @@ class platform::drbd::params (
|
||||||
$host2 = $::platform::params::controller_1_hostname
|
$host2 = $::platform::params::controller_1_hostname
|
||||||
|
|
||||||
include ::platform::network::mgmt::params
|
include ::platform::network::mgmt::params
|
||||||
include ::platform::network::infra::params
|
$ip1 = $::platform::network::mgmt::params::controller0_address
|
||||||
|
$ip2 = $::platform::network::mgmt::params::controller1_address
|
||||||
if $::platform::network::infra::params::interface_name {
|
|
||||||
$ip1 = $::platform::network::infra::params::controller0_address
|
|
||||||
$ip2 = $::platform::network::infra::params::controller1_address
|
|
||||||
} else {
|
|
||||||
$ip1 = $::platform::network::mgmt::params::controller0_address
|
|
||||||
$ip2 = $::platform::network::mgmt::params::controller1_address
|
|
||||||
}
|
|
||||||
|
|
||||||
$manage = str2bool($::is_initial_config)
|
$manage = str2bool($::is_initial_config)
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,28 +40,6 @@ class platform::network::mgmt::params(
|
||||||
$cgcs_nfs_address = undef,
|
$cgcs_nfs_address = undef,
|
||||||
) { }
|
) { }
|
||||||
|
|
||||||
|
|
||||||
class platform::network::infra::params(
|
|
||||||
# shared parametes with base class - required for auto hiera parameter lookup
|
|
||||||
$interface_name = undef,
|
|
||||||
$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
|
|
||||||
$mtu = 1500,
|
|
||||||
# network type specific parameters
|
|
||||||
$cgcs_nfs_address = undef,
|
|
||||||
) { }
|
|
||||||
|
|
||||||
class platform::network::oam::params(
|
class platform::network::oam::params(
|
||||||
# shared parametes with base class - required for auto hiera parameter lookup
|
# shared parametes with base class - required for auto hiera parameter lookup
|
||||||
$interface_name = undef,
|
$interface_name = undef,
|
||||||
|
@ -165,13 +143,11 @@ class platform::network (
|
||||||
) {
|
) {
|
||||||
include ::platform::params
|
include ::platform::params
|
||||||
include ::platform::network::mgmt::params
|
include ::platform::network::mgmt::params
|
||||||
include ::platform::network::infra::params
|
|
||||||
include ::platform::network::cluster_host::params
|
include ::platform::network::cluster_host::params
|
||||||
|
|
||||||
include ::platform::network::apply
|
include ::platform::network::apply
|
||||||
|
|
||||||
$management_interface = $::platform::network::mgmt::params::interface_name
|
$management_interface = $::platform::network::mgmt::params::interface_name
|
||||||
$infrastructure_interface = $::platform::network::infra::params::interface_name
|
|
||||||
|
|
||||||
$testcmd = '/usr/local/bin/connectivity_test'
|
$testcmd = '/usr/local/bin/connectivity_test'
|
||||||
|
|
||||||
|
@ -183,14 +159,6 @@ class platform::network (
|
||||||
onlyif => 'test ! -f /etc/platform/simplex',
|
onlyif => 'test ! -f /etc/platform/simplex',
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if $infrastructure_interface {
|
|
||||||
exec { 'connectivity-test-infrastructure':
|
|
||||||
command => "${testcmd} -t 120 -i ${infrastructure_interface} controller-nfs; /bin/true",
|
|
||||||
require => Anchor['platform::networking'],
|
|
||||||
onlyif => 'test ! -f /etc/platform/simplex',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if $mlx4_core_options {
|
if $mlx4_core_options {
|
||||||
|
|
|
@ -124,7 +124,7 @@ class platform::sm
|
||||||
$platform_nfs_ip_param_mask = $::platform::network::mgmt::params::subnet_prefixlen
|
$platform_nfs_ip_param_mask = $::platform::network::mgmt::params::subnet_prefixlen
|
||||||
$platform_nfs_ip_network_url = $::platform::network::mgmt::params::subnet_network_url
|
$platform_nfs_ip_network_url = $::platform::network::mgmt::params::subnet_network_url
|
||||||
|
|
||||||
# CGCS NFS network is over the infrastructure network if configured
|
# CGCS NFS network is over the management network
|
||||||
$cgcs_nfs_ip_interface = $::platform::network::mgmt::params::interface_name
|
$cgcs_nfs_ip_interface = $::platform::network::mgmt::params::interface_name
|
||||||
$cgcs_nfs_ip_param_ip = $::platform::network::mgmt::params::cgcs_nfs_address
|
$cgcs_nfs_ip_param_ip = $::platform::network::mgmt::params::cgcs_nfs_address
|
||||||
$cgcs_nfs_ip_network_url = $::platform::network::mgmt::params::subnet_network_url
|
$cgcs_nfs_ip_network_url = $::platform::network::mgmt::params::subnet_network_url
|
||||||
|
@ -201,8 +201,8 @@ class platform::sm
|
||||||
$management_peer_unit_ip = undef
|
$management_peer_unit_ip = undef
|
||||||
$oam_my_unit_ip = undef
|
$oam_my_unit_ip = undef
|
||||||
$oam_peer_unit_ip = undef
|
$oam_peer_unit_ip = undef
|
||||||
$infra_my_unit_ip = undef
|
$cluster_host_my_unit_ip = undef
|
||||||
$infra_peer_unit_ip = undef
|
$cluster_host_peer_unit_ip = undef
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,13 +15,3 @@ retry 5;
|
||||||
# are not using the same client-id value.
|
# are not using the same client-id value.
|
||||||
send dhcp6.client-id = concat(00:03:00, hardware);
|
send dhcp6.client-id = concat(00:03:00, hardware);
|
||||||
send dhcp-client-identifier = concat(00:03:00, hardware);
|
send dhcp-client-identifier = concat(00:03:00, hardware);
|
||||||
|
|
||||||
<%- if @infra_client_id != nil -%>
|
|
||||||
interface "<%= @infra_interface %>" {
|
|
||||||
<%- if @infra_subnet_version == 4 -%>
|
|
||||||
send dhcp-client-identifier <%= @infra_client_id %>;
|
|
||||||
<%- else -%>
|
|
||||||
send dhcp6.client-id <%= @infra_client_id %>;
|
|
||||||
<%- end -%>
|
|
||||||
}
|
|
||||||
<%- end -%>
|
|
||||||
|
|
|
@ -3,9 +3,6 @@
|
||||||
interface=<%= @pxeboot_interface %>
|
interface=<%= @pxeboot_interface %>
|
||||||
<%- end -%>
|
<%- end -%>
|
||||||
interface=<%= @mgmt_interface %>
|
interface=<%= @mgmt_interface %>
|
||||||
<%- if @infra_interface != nil -%>
|
|
||||||
interface=<%= @infra_interface %>
|
|
||||||
<%- end -%>
|
|
||||||
bind-interfaces
|
bind-interfaces
|
||||||
|
|
||||||
# Serve addresses from the pxeboot subnet
|
# Serve addresses from the pxeboot subnet
|
||||||
|
@ -34,20 +31,6 @@ dhcp-option=tag:mgmt,option:mtu,<%= @mgmt_network_mtu %>
|
||||||
dhcp-option=tag:mgmt,option6:dns-server,[<%= @mgmt_controller_address %>]
|
dhcp-option=tag:mgmt,option6:dns-server,[<%= @mgmt_controller_address %>]
|
||||||
<%- end -%>
|
<%- end -%>
|
||||||
|
|
||||||
<%- if @infra_interface != nil -%>
|
|
||||||
# Serve addresses from the infrastructure subnet
|
|
||||||
dhcp-range=set:infra,<%= @infra_subnet_start %>,static,<%= @infra_subnet_netmask %>,1d
|
|
||||||
|
|
||||||
# Provide DNS services on the floating infrastructure address
|
|
||||||
<%- if @infra_subnet_version == 4 -%>
|
|
||||||
dhcp-option=tag:infra,option:dns-server
|
|
||||||
dhcp-option=tag:infra,option:router
|
|
||||||
dhcp-option=tag:infra,option:mtu,<%= @infra_network_mtu %>
|
|
||||||
<%- else -%>
|
|
||||||
dhcp-option=tag:infra,option6:dns-server
|
|
||||||
<%- end -%>
|
|
||||||
<%- end -%>
|
|
||||||
|
|
||||||
# Provide private option 224 as install_uuid
|
# Provide private option 224 as install_uuid
|
||||||
dhcp-option=224,<%= @install_uuid %>
|
dhcp-option=224,<%= @install_uuid %>
|
||||||
dhcp-option=option6:224,<%= @install_uuid %>
|
dhcp-option=option6:224,<%= @install_uuid %>
|
||||||
|
|
Loading…
Reference in New Issue