summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSofer Athlan-Guyot <chem@sathlan.org>2016-03-18 11:56:55 +0100
committerSofer Athlan-Guyot <chem@sathlan.org>2016-03-21 12:53:45 +0100
commit1e4101d1cd1e3b2550888452ca6b9aeeaa90cf9b (patch)
treec21dc6d02ab96bac3c7d2f80401f4f6bc4bea29a
parent53e2f2dea7d6c7d3e623082141b6fedbc301c276 (diff)
Remove unused user resource.
The user is created by installation of of the pacemaker package, so it's not required to add it to the resource catalog. This paves the way to merge the refeactoring of the puppet-pacemaker module[1]. It brings a lot of changes, one of them is an idempotent handling of the hacluster user's password. Removing it here prevents duplicate resource error durring puppet run. [1] https://review.openstack.org/#/c/294182/ Change-Id: I56849d9fc00bd3ce342d5c440cfe7c5b6d26b5bf
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp3
1 files changed, 0 insertions, 3 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index db3d8652..33338f2d 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -68,9 +68,6 @@ if hiera('step') >= 1 {
} else {
$cluster_setup_extras = {}
}
- user { 'hacluster':
- ensure => present,
- } ->
class { '::pacemaker':
hacluster_pwd => hiera('hacluster_pwd'),
} ->