aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-14 23:03:27 +0000
committerGerrit Code Review <review@openstack.org>2017-08-14 23:03:27 +0000
commit84362d3385f72ec1a1a0d5b792f091c5af6e4afd (patch)
tree31ecbe7c9f5ce94247eb02836107e5131060309f /puppet
parent725b0bf79e984dfeda106af4defd28af34870a8e (diff)
parent96795a94da4df3a52c3c28a7c70419c3208c9c4b (diff)
Merge "Make HA container bundle work on remote nodes"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/pacemaker_remote.yaml13
1 files changed, 13 insertions, 0 deletions
diff --git a/puppet/services/pacemaker_remote.yaml b/puppet/services/pacemaker_remote.yaml
index 76511784..47ca6142 100644
--- a/puppet/services/pacemaker_remote.yaml
+++ b/puppet/services/pacemaker_remote.yaml
@@ -35,6 +35,11 @@ parameters:
description: The authkey for the pacemaker remote service.
hidden: true
default: ''
+ PcsdPassword:
+ type: string
+ description: The password for the 'pcsd' user for pacemaker.
+ hidden: true
+ default: ''
MonitoringSubscriptionPacemakerRemote:
default: 'overcloud-pacemaker_remote'
type: string
@@ -103,5 +108,13 @@ outputs:
tripleo::fencing::config: {get_param: FencingConfig}
enable_fencing: {get_param: EnableFencing}
tripleo::profile::base::pacemaker_remote::remote_authkey: {get_param: PacemakerRemoteAuthkey}
+ pacemaker::corosync::manage_fw: false
+ hacluster_pwd:
+ yaql:
+ expression: $.data.passwords.where($ != '').first()
+ data:
+ passwords:
+ - {get_param: PcsdPassword}
+ - {get_param: [DefaultPasswords, pcsd_password]}
step_config: |
include ::tripleo::profile::base::pacemaker_remote