From fe097a2f36524ddd07039697a03149c05c9913fb Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Mon, 1 Dec 2014 16:55:41 +0300 Subject: [PATCH] Change is_online? to use dc-version Use dc-version to determine if cib is ready to work with. Change-Id: I4bf0e4f63b45c75f37709b2c5e54d830281742b2 Related-Bug: 1396481 --- .../puppet/corosync/lib/puppet/provider/pacemaker_common.rb | 6 +++--- .../corosync/lib/puppet/provider/service/pacemaker.rb | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/deployment/puppet/corosync/lib/puppet/provider/pacemaker_common.rb b/deployment/puppet/corosync/lib/puppet/provider/pacemaker_common.rb index f3a54c269b..da178fd192 100644 --- a/deployment/puppet/corosync/lib/puppet/provider/pacemaker_common.rb +++ b/deployment/puppet/corosync/lib/puppet/provider/pacemaker_common.rb @@ -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 diff --git a/deployment/puppet/corosync/lib/puppet/provider/service/pacemaker.rb b/deployment/puppet/corosync/lib/puppet/provider/service/pacemaker.rb index 5a6a0f2571..221ac2a3bc 100644 --- a/deployment/puppet/corosync/lib/puppet/provider/service/pacemaker.rb +++ b/deployment/puppet/corosync/lib/puppet/provider/service/pacemaker.rb @@ -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