Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

I was having the same issue. I changed lines 319-322 in vmwaretools\m… #51

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

I was having the same issue. I changed lines 319-322 in vmwaretools\m… #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3fc7da7
I was having the same issue. I changed lines 319-322 in vmwaretools\m…
Jul 8, 2016
f960642
Update init.pp
esarakaitis Jul 12, 2016
372e80f
fixed more spacing
Jul 12, 2016
2fab38a
updated to use /sbin/service versus /sbin/start
Jul 12, 2016
f75b467
update runtime rules
Jul 12, 2016
ad41d9e
updating runtimes
Jul 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,10 +341,10 @@
ensure => $service_ensure_real,
hasrestart => true,
hasstatus => true,
start => "/sbin/start ${service_name_real}",
stop => "/sbin/stop ${service_name_real}",
status => "/sbin/status ${service_name_real} | grep -q 'start/'",
restart => "/sbin/restart ${service_name_real}",
start => "/sbin/service ${service_name_real} start",
stop => "/sbin/service ${service_name_real} stop",
status => "/sbin/service ${service_name_real} status",
restart => "/sbin/service ${service_name_real} restart",
require => Package[$package_real],
}
} else {
Expand Down
8 changes: 4 additions & 4 deletions spec/classes/vmwaretools_init_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
)}
it { should contain_package('vmware-tools-esx-kmods') }
it { should_not contain_service('vmware-tools-services').with_pattern('vmtoolsd') }
it { should contain_service('vmware-tools-services').with_start('/sbin/start vmware-tools-services') }
it { should contain_service('vmware-tools-services').with_start('/sbin/service vmware-tools-services start') }
it { should contain_file('/etc/udev/rules.d/99-vmware-scsi-udev.rules').with(
:content => "#\n# VMware SCSI devices Timeout adjustment\n#\n# Modify the timeout value for VMware SCSI devices so that\n# in the event of a failover, we don't time out.\n# See Bug 271286 for more information.\n\n\nACTION==\"add\", SUBSYSTEMS==\"scsi\", ATTRS{vendor}==\"VMware \", ATTRS{model}==\"Virtual disk \", RUN+=\"/bin/sh -c 'echo 14400 >/sys$DEVPATH/timeout'\"\nACTION==\"add\", SUBSYSTEMS==\"scsi\", ATTRS{vendor}==\"VMware, \", ATTRS{model}==\"VMware Virtual S\", RUN+=\"/bin/sh -c 'echo 14400 >/sys$DEVPATH/timeout'\"\n\n"
) }
Expand Down Expand Up @@ -229,7 +229,7 @@
it { should contain_package('vmware-tools-esx-nox') }
it { should contain_package('vmware-tools-esx-kmods') }
it { should contain_service('vmware-tools-services').with_pattern('vmtoolsd') }
it { should_not contain_service('vmware-tools-services').with_start('/sbin/start vmware-tools-services') }
it { should_not contain_service('vmware-tools-services').with_start('/sbin/start vmware-tools-services start') }
end

describe 'tools_version => 5.1 and operatingsystem => RedHat 6' do
Expand All @@ -238,7 +238,7 @@
it { should contain_package('vmware-tools-esx-nox') }
it { should contain_package('vmware-tools-esx-kmods') }
it { should_not contain_service('vmware-tools-services').with_pattern('vmtoolsd') }
it { should contain_service('vmware-tools-services').with_start('/sbin/start vmware-tools-services') }
it { should contain_service('vmware-tools-services').with_start('/sbin/service vmware-tools-services start') }
end

describe 'tools_version => 5.5p02 and operatingsystem => RedHat 6' do
Expand All @@ -247,7 +247,7 @@
it { should contain_package('vmware-tools-esx-nox') }
it { should contain_package('vmware-tools-esx-kmods') }
it { should_not contain_service('vmware-tools-services').with_pattern('vmtoolsd') }
it { should contain_service('vmware-tools-services').with_start('/sbin/start vmware-tools-services') }
it { should contain_service('vmware-tools-services').with_start('/sbin/service vmware-tools-services start') }
end

describe 'tools_version => 5.1 and operatingsystem => SLES' do
Expand Down