diff options
author | Bogdan Dobrelya <bdobrelia@mirantis.com> | 2015-11-13 12:15:42 +0100 |
---|---|---|
committer | Bogdan Dobrelya <bdobrelia@mirantis.com> | 2015-11-13 12:15:42 +0100 |
commit | 1dffa5e7582f9923e28d168c1cd63357a0ae3b0c (patch) | |
tree | d82cdb9e8e5c8d0eb946c84624d33165c17685ed | |
parent | 231addb8bfc6dbb03d447f04599fcc8c67f0c99d (diff) |
Closes-bug: #1515919
Change-Id: Ife8cecd13a4232db0df621c73963605a6b217213
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
Notes
Notes (review):
Verified+2: Jenkins
Code-Review+2: Bogdan Dobrelya <bdobrelia@mirantis.com>
Workflow+1: Bogdan Dobrelya <bdobrelia@mirantis.com>
Submitted-by: Jenkins
Submitted-at: Fri, 13 Nov 2015 11:18:56 +0000
Reviewed-on: https://review.openstack.org/245092
Project: openstack/fuel-plugin-ha-fencing
Branch: refs/heads/master
-rw-r--r-- | deployment_scripts/puppet/modules/pcs_fencing/manifests/fencing.pp | 3 | ||||
-rw-r--r-- | deployment_scripts/puppet/modules/pcs_fencing/spec/defines/fencing_spec.rb | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/deployment_scripts/puppet/modules/pcs_fencing/manifests/fencing.pp b/deployment_scripts/puppet/modules/pcs_fencing/manifests/fencing.pp index 7afc6f7..666a4ec 100644 --- a/deployment_scripts/puppet/modules/pcs_fencing/manifests/fencing.pp +++ b/deployment_scripts/puppet/modules/pcs_fencing/manifests/fencing.pp | |||
@@ -44,7 +44,8 @@ define pcs_fencing::fencing ( | |||
44 | 44 | ||
45 | cs_resource { $res_name: | 45 | cs_resource { $res_name: |
46 | ensure => present, | 46 | ensure => present, |
47 | provided_by => 'pacemaker', | 47 | # stonith does not support providers |
48 | provided_by => undef, | ||
48 | primitive_class => 'stonith', | 49 | primitive_class => 'stonith', |
49 | primitive_type => $agent_type, | 50 | primitive_type => $agent_type, |
50 | parameters => $parameters, | 51 | parameters => $parameters, |
diff --git a/deployment_scripts/puppet/modules/pcs_fencing/spec/defines/fencing_spec.rb b/deployment_scripts/puppet/modules/pcs_fencing/spec/defines/fencing_spec.rb index 8cf03d7..85c95d8 100644 --- a/deployment_scripts/puppet/modules/pcs_fencing/spec/defines/fencing_spec.rb +++ b/deployment_scripts/puppet/modules/pcs_fencing/spec/defines/fencing_spec.rb | |||
@@ -16,7 +16,7 @@ describe 'pcs_fencing::fencing', :type => :define do | |||
16 | let :primitive_params do | 16 | let :primitive_params do |
17 | { | 17 | { |
18 | :ensure => 'present', | 18 | :ensure => 'present', |
19 | :provided_by => 'pacemaker', | 19 | :provided_by => nil, |
20 | :primitive_class => 'stonith', | 20 | :primitive_class => 'stonith', |
21 | :primitive_type => params[:agent_type], | 21 | :primitive_type => params[:agent_type], |
22 | :parameters => params[:parameters], | 22 | :parameters => params[:parameters], |
@@ -40,7 +40,7 @@ describe 'pcs_fencing::fencing', :type => :define do | |||
40 | ["expressions", [ | 40 | ["expressions", [ |
41 | {"attribute"=>"#uname", | 41 | {"attribute"=>"#uname", |
42 | "operation"=>"ne", | 42 | "operation"=>"ne", |
43 | "value"=>"node-1"}]]] | 43 | "value"=>"node-1"}]]] |
44 | } | 44 | } |
45 | end | 45 | end |
46 | let(:facts) {{ :osfamily => 'Debian' }} | 46 | let(:facts) {{ :osfamily => 'Debian' }} |