From a2c247cd2df64b32168daa91d65162435d90c5db Mon Sep 17 00:00:00 2001 From: marvin Date: Tue, 3 Sep 2019 04:52:24 +0000 Subject: [PATCH] Removing unused flag disable_worker_services The disable_worker_services file was originally created to prevent the (bare metal) nova-compute services from running on a newly upgraded controller in an AIO-DX configuration. This situation no longer exists because the bare metal nova-compute services do not exist after transiting to containers. this flag is no longer needed. Removing all references to the disable_worker_services file. Change-Id: I4f11674956f9aae1e4e805db2eb0696c3023e71e Closes-Bug: #1838432 Signed-off-by: marvin --- .../modules/platform/lib/facter/disable_worker_services.rb | 7 ------- .../src/modules/platform/manifests/kubernetes.pp | 4 ---- 2 files changed, 11 deletions(-) delete mode 100644 puppet-manifests/src/modules/platform/lib/facter/disable_worker_services.rb diff --git a/puppet-manifests/src/modules/platform/lib/facter/disable_worker_services.rb b/puppet-manifests/src/modules/platform/lib/facter/disable_worker_services.rb deleted file mode 100644 index 8c40aa1e..00000000 --- a/puppet-manifests/src/modules/platform/lib/facter/disable_worker_services.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Returns true if worker services should be disabled - -Facter.add("disable_worker_services") do - setcode do - File.exist?('/var/run/.disable_worker_services') - end -end diff --git a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp index 2ed49b85..8c03f159 100644 --- a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp +++ b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp @@ -598,10 +598,6 @@ class platform::kubernetes::worker } } - file { '/var/run/.disable_worker_services': - ensure => file, - replace => no, - } # TODO: The following exec is a workaround. Once kubernetes becomes the # default installation, /etc/pmon.d/libvirtd.conf needs to be removed from # the load.