Merge "check value of kubernetes host labels"
This commit is contained in:
commit
063010b90f
|
@ -56,7 +56,7 @@ class platform::kubernetes::params (
|
||||||
|
|
||||||
class platform::kubernetes::configuration {
|
class platform::kubernetes::configuration {
|
||||||
|
|
||||||
if 'kube-ignore-isol-cpus' in $::platform::kubernetes::params::host_labels {
|
if 'kube-ignore-isol-cpus=enabled' in $::platform::kubernetes::params::host_labels {
|
||||||
$ensure = 'present'
|
$ensure = 'present'
|
||||||
} else {
|
} else {
|
||||||
$ensure = 'absent'
|
$ensure = 'absent'
|
||||||
|
@ -212,7 +212,7 @@ class platform::kubernetes::kubeadm {
|
||||||
} else {
|
} else {
|
||||||
if !$::platform::params::virtual_system {
|
if !$::platform::params::virtual_system {
|
||||||
if str2bool($::is_worker_subfunction)
|
if str2bool($::is_worker_subfunction)
|
||||||
and !('openstack-compute-node' in $host_labels) {
|
and !('openstack-compute-node=enabled' in $host_labels) {
|
||||||
# Enable TopologyManager for hosts with the worker subfunction.
|
# Enable TopologyManager for hosts with the worker subfunction.
|
||||||
# Exceptions are:
|
# Exceptions are:
|
||||||
# - DC System controllers
|
# - DC System controllers
|
||||||
|
@ -498,7 +498,7 @@ class platform::kubernetes::worker::sriovdp {
|
||||||
$host_labels = $::platform::kubernetes::params::host_labels
|
$host_labels = $::platform::kubernetes::params::host_labels
|
||||||
if ($::personality == 'controller') and
|
if ($::personality == 'controller') and
|
||||||
str2bool($::is_worker_subfunction)
|
str2bool($::is_worker_subfunction)
|
||||||
and ('sriovdp' in $host_labels) {
|
and ('sriovdp=enabled' in $host_labels) {
|
||||||
exec { 'Delete sriov device plugin pod if present':
|
exec { 'Delete sriov device plugin pod if present':
|
||||||
path => '/usr/bin:/usr/sbin:/bin',
|
path => '/usr/bin:/usr/sbin:/bin',
|
||||||
command => 'kubectl --kubeconfig=/etc/kubernetes/admin.conf delete pod -n kube-system --selector=app=sriovdp --field-selector spec.nodeName=$(hostname) --timeout=360s', # lint:ignore:140chars
|
command => 'kubectl --kubeconfig=/etc/kubernetes/admin.conf delete pod -n kube-system --selector=app=sriovdp --field-selector spec.nodeName=$(hostname) --timeout=360s', # lint:ignore:140chars
|
||||||
|
|
|
@ -18,7 +18,7 @@ class platform::lmon
|
||||||
$host_labels = $::platform::kubernetes::params::host_labels
|
$host_labels = $::platform::kubernetes::params::host_labels
|
||||||
|
|
||||||
$data_interface = length($data_iface_devices) > 0
|
$data_interface = length($data_iface_devices) > 0
|
||||||
and !('openstack-compute-node'
|
and !('openstack-compute-node=enabled'
|
||||||
in $host_labels)
|
in $host_labels)
|
||||||
$data_interface_str = join($data_iface_devices,',')
|
$data_interface_str = join($data_iface_devices,',')
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue