diff --git a/deployment/puppet/sysfs/manifests/init.pp b/deployment/puppet/sysfs/manifests/init.pp index e5fa9cdc1c..a455d3d3d8 100644 --- a/deployment/puppet/sysfs/manifests/init.pp +++ b/deployment/puppet/sysfs/manifests/init.pp @@ -5,8 +5,6 @@ # class sysfs { - class { 'sysfs::install' :} + class { 'sysfs::install' :}-> class { 'sysfs::service' :} - - Class['sysfs::install'] ~> Class['sysfs::service'] } diff --git a/deployment/puppet/sysfs/manifests/install.pp b/deployment/puppet/sysfs/manifests/install.pp index 89b89e4df3..d3e00ea235 100644 --- a/deployment/puppet/sysfs/manifests/install.pp +++ b/deployment/puppet/sysfs/manifests/install.pp @@ -25,14 +25,8 @@ class sysfs::install inherits sysfs::params { name => $package, } - tweaks::ubuntu_service_override { 'sysfsutils' : - package_name => $package, - } - file { 'sysfs.d' : ensure => 'directory', name => $config_dir, } - - Class['sysfs::install'] -> Sysfs_config_value <||> } diff --git a/deployment/puppet/sysfs/spec/classes/sysfs_install_spec.rb b/deployment/puppet/sysfs/spec/classes/sysfs_install_spec.rb index 9a96e65841..946db36674 100644 --- a/deployment/puppet/sysfs/spec/classes/sysfs_install_spec.rb +++ b/deployment/puppet/sysfs/spec/classes/sysfs_install_spec.rb @@ -26,8 +26,6 @@ describe 'sysfs::install' do :ensure => 'present', :source => 'puppet:///modules/sysfs/centos-sysfsutils.init.sh') end - should contain_tweaks__ubuntu_service_override('sysfsutils').with( - :package_name => 'sysfsutils') end end