SM monitors cluster-host floating IP
The cluster-host floating IP is managed by SM. This commit reuses the existing cinder-ip service to monitor the cluster-host floating IP address for the kubernetes config. This is a temporary change until a cluster-host-ip resource is added to SM. Story: 2004273 Task: 28962 Change-Id: Ibff1766e6115b946cba6f8f1289463ceb866d135 Signed-off-by: Teresa Ho <teresa.ho@windriver.com>
This commit is contained in:
parent
3122a565ae
commit
973b0681ce
|
@ -37,6 +37,8 @@ class platform::sm
|
||||||
# Repurposing the infra interface for cluster-host interface
|
# Repurposing the infra interface for cluster-host interface
|
||||||
include ::platform::network::cluster_host::params
|
include ::platform::network::cluster_host::params
|
||||||
$infra_ip_interface = $::platform::network::cluster_host::params::interface_name
|
$infra_ip_interface = $::platform::network::cluster_host::params::interface_name
|
||||||
|
$cluster_host_ip_param_ip = $::platform::network::cluster_host::params::controller_address
|
||||||
|
$cluster_host_ip_param_mask = $::platform::network::cluster_host::params::subnet_prefixlen
|
||||||
} else {
|
} else {
|
||||||
$infra_ip_interface = $::platform::network::infra::params::interface_name
|
$infra_ip_interface = $::platform::network::infra::params::interface_name
|
||||||
}
|
}
|
||||||
|
@ -138,7 +140,19 @@ class platform::sm
|
||||||
$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 infrastructure network if configured
|
||||||
if $infra_ip_interface and $kubernetes_enabled != true {
|
if $kubernetes_enabled {
|
||||||
|
$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_network_url = $::platform::network::mgmt::params::subnet_network_url
|
||||||
|
$cgcs_nfs_ip_param_mask = $::platform::network::mgmt::params::subnet_prefixlen
|
||||||
|
|
||||||
|
# Re-using cinder-ip for cluster-host-ip for now
|
||||||
|
# This will be changed when the cluster-host-ip resource is added to SM
|
||||||
|
$cinder_ip_interface = $::platform::network::cluster_host::params::interface_name
|
||||||
|
$cinder_ip_param_ip = $::platform::network::cluster_host::params::controller_address
|
||||||
|
$cinder_ip_param_mask = $::platform::network::cluster_host::params::subnet_prefixlen
|
||||||
|
} else {
|
||||||
|
if $infra_ip_interface {
|
||||||
$cgcs_nfs_ip_interface = $::platform::network::infra::params::interface_name
|
$cgcs_nfs_ip_interface = $::platform::network::infra::params::interface_name
|
||||||
$cgcs_nfs_ip_param_ip = $::platform::network::infra::params::cgcs_nfs_address
|
$cgcs_nfs_ip_param_ip = $::platform::network::infra::params::cgcs_nfs_address
|
||||||
$cgcs_nfs_ip_network_url = $::platform::network::infra::params::subnet_network_url
|
$cgcs_nfs_ip_network_url = $::platform::network::infra::params::subnet_network_url
|
||||||
|
@ -155,6 +169,7 @@ class platform::sm
|
||||||
$cinder_ip_interface = $::platform::network::mgmt::params::interface_name
|
$cinder_ip_interface = $::platform::network::mgmt::params::interface_name
|
||||||
$cinder_ip_param_mask = $::platform::network::mgmt::params::subnet_prefixlen
|
$cinder_ip_param_mask = $::platform::network::mgmt::params::subnet_prefixlen
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$platform_nfs_subnet_url = "${platform_nfs_ip_network_url}/${platform_nfs_ip_param_mask}"
|
$platform_nfs_subnet_url = "${platform_nfs_ip_network_url}/${platform_nfs_ip_param_mask}"
|
||||||
$cgcs_nfs_subnet_url = "${cgcs_nfs_ip_network_url}/${cgcs_nfs_ip_param_mask}"
|
$cgcs_nfs_subnet_url = "${cgcs_nfs_ip_network_url}/${cgcs_nfs_ip_param_mask}"
|
||||||
|
@ -210,7 +225,9 @@ class platform::sm
|
||||||
include ::openstack::cinder::params
|
include ::openstack::cinder::params
|
||||||
$cinder_service_enabled = $::openstack::cinder::params::service_enabled
|
$cinder_service_enabled = $::openstack::cinder::params::service_enabled
|
||||||
$cinder_region_name = $::openstack::cinder::params::region_name
|
$cinder_region_name = $::openstack::cinder::params::region_name
|
||||||
|
if $kubernetes_enabled != true {
|
||||||
$cinder_ip_param_ip = $::openstack::cinder::params::cinder_address
|
$cinder_ip_param_ip = $::openstack::cinder::params::cinder_address
|
||||||
|
}
|
||||||
$cinder_backends = $::openstack::cinder::params::enabled_backends
|
$cinder_backends = $::openstack::cinder::params::enabled_backends
|
||||||
$cinder_drbd_resource = $::openstack::cinder::params::drbd_resource
|
$cinder_drbd_resource = $::openstack::cinder::params::drbd_resource
|
||||||
$cinder_vg_name = $::openstack::cinder::params::cinder_vg_name
|
$cinder_vg_name = $::openstack::cinder::params::cinder_vg_name
|
||||||
|
@ -375,7 +392,6 @@ class platform::sm
|
||||||
command => "sm-configure service_instance oam-ip oam-ip \"ip=${oam_ip_param_ip},cidr_netmask=${oam_ip_param_mask},nic=${oam_ip_interface},arp_count=7\"",
|
command => "sm-configure service_instance oam-ip oam-ip \"ip=${oam_ip_param_ip},cidr_netmask=${oam_ip_param_mask},nic=${oam_ip_interface},arp_count=7\"",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if $system_mode == 'duplex-direct' or $system_mode == 'simplex' {
|
if $system_mode == 'duplex-direct' or $system_mode == 'simplex' {
|
||||||
exec { 'Configure Management IP':
|
exec { 'Configure Management IP':
|
||||||
command => "sm-configure service_instance management-ip management-ip \"ip=${mgmt_ip_param_ip},cidr_netmask=${mgmt_ip_param_mask},nic=${mgmt_ip_interface},arp_count=7,dc=yes\"",
|
command => "sm-configure service_instance management-ip management-ip \"ip=${mgmt_ip_param_ip},cidr_netmask=${mgmt_ip_param_mask},nic=${mgmt_ip_interface},arp_count=7,dc=yes\"",
|
||||||
|
@ -778,6 +794,28 @@ class platform::sm
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if $kubernetes_enabled {
|
||||||
|
# Re-using cinder-ip for cluster-host-ip for now
|
||||||
|
# This will be changed when the cluster-host-ip resource is added to SM
|
||||||
|
exec { 'Configure Cinder IP in SM (service-group-member cinder-ip)':
|
||||||
|
command =>
|
||||||
|
'sm-provision service-group-member controller-services cinder-ip',
|
||||||
|
}
|
||||||
|
-> exec { 'Configure Cinder IP in SM (service cinder-ip)':
|
||||||
|
command => 'sm-provision service cinder-ip',
|
||||||
|
}
|
||||||
|
|
||||||
|
if $system_mode == 'duplex-direct' or $system_mode == 'simplex' {
|
||||||
|
exec { 'Configure Cinder IP service instance':
|
||||||
|
command => "sm-configure service_instance cinder-ip cinder-ip \"ip=${cinder_ip_param_ip},cidr_netmask=${cinder_ip_param_mask},nic=${cinder_ip_interface},arp_count=7,dc=yes\"",
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
exec { 'Configure Cinder IP service instance':
|
||||||
|
command => "sm-configure service_instance cinder-ip cinder-ip \"ip=${cinder_ip_param_ip},cidr_netmask=${cinder_ip_param_mask},nic=${cinder_ip_interface},arp_count=7\"",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if $region_config {
|
if $region_config {
|
||||||
if $neutron_region_name != $region_2_name {
|
if $neutron_region_name != $region_2_name {
|
||||||
$configure_neturon = false
|
$configure_neturon = false
|
||||||
|
|
Loading…
Reference in New Issue