Adding back kvm_advance_timer service

On compute nodes with openstack-compute label, the
kvm_timer_advance_setup.service should be enabled.

The puppet service runs before kubelet.

Change-Id: I84d6c6234d4bd1c8c0c52f5735d7520377b2fe80
Partial-Bug: 1823751
Depends-On: https://review.opendev.org/#/c/672124
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
Al Bailey
2019-07-22 13:37:15 -05:00
parent 8fbad03ec0
commit 942d4f7e56
3 changed files with 36 additions and 1 deletions

View File

@@ -1,2 +1,2 @@
SRC_DIR="src"
TIS_PATCH_VER=91
TIS_PATCH_VER=92

View File

@@ -351,6 +351,38 @@ class platform::compute::machine {
}
}
class platform::compute::kvm_timer_advance(
$enabled = False,
$vcpu_pin_set = undef
) {
if $enabled {
# include the declaration of the kubelet service
include ::platform::kubernetes::worker
file { '/etc/kvm-timer-advance/kvm-timer-advance.conf':
ensure => 'present',
replace => true,
content => template('platform/kvm_timer_advance.conf.erb')
}
-> service { 'kvm_timer_advance_setup':
ensure => 'running',
enable => true,
before => Service['kubelet'],
}
# A separate enable is required since we have modified the service resource
# to never enable/disable services in puppet.
-> exec { 'Enable kvm_timer_advance_setup':
command => '/usr/bin/systemctl enable kvm_timer_advance_setup.service',
}
} else {
# A disable is required since we have modified the service resource
# to never enable/disable services in puppet and stop has no effect.
exec { 'Disable kvm_timer_advance_setup':
command => '/usr/bin/systemctl disable kvm_timer_advance_setup.service',
}
}
}
class platform::compute {
Class[$name] -> Class['::platform::vswitch']
@@ -362,4 +394,5 @@ class platform::compute {
require ::platform::compute::resctrl
require ::platform::compute::machine
require ::platform::compute::config
require ::platform::compute::kvm_timer_advance
}

View File

@@ -0,0 +1,2 @@
[kvm-timer-advance]
vcpu_pin_set=<%= @vcpu_pin_set %>