Merge "Change is_online? to use dc-version"

This commit is contained in:
Jenkins 2014-12-01 17:13:41 +00:00 committed by Gerrit Code Review
commit 93f1d72d7a
2 changed files with 4 additions and 3 deletions

View File

@ -599,12 +599,12 @@ class Puppet::Provider::Pacemaker_common < Puppet::Provider
# @return [TrueClass,FalseClass]
def is_online?
begin
cibadmin '-Q'
dc_version = crm_attribute '-q', '--type', 'crm_config', '--query', '--name', 'dc-version'
return false unless dc_version
return false if dc_version.empty?
true
rescue Puppet::ExecutionFailure
false
else
true
end
end

View File

@ -8,6 +8,7 @@ Puppet::Type.type(:service).provide :pacemaker, :parent => Puppet::Provider::Pac
commands :uname => 'uname'
commands :pcs => 'pcs'
commands :crm_resource => 'crm_resource'
commands :crm_attribute => 'crm_attribute'
commands :cibadmin => 'cibadmin'
# hostname of the current node