summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Jones <cmsj@tenshu.net>2017-04-25 16:03:10 +0100
committerChris Jones <cmsj@tenshu.net>2017-06-13 08:41:50 +0000
commitadf344a704be8304ab454104b45aa4af1698330f (patch)
tree730745bd4946f2aa2ff0df952c510f48ec6ee9b3
parentc9afae93f2abc1a8622737c5a4c878b0ca3faad4 (diff)
Add support for autofencing to Pacemaker Remote.
We now pass configuration for autofencing to Pacemaker Remote nodes. Change-Id: Ibb9c65a83cc909528024c538cf3bcc96390c555e Depends-On: I87c60bd56feac6dedc00a3c458b805aa9b71d9ce Closes-Bug: #1686115 (cherry picked from commit 05953542a6b688ee549671a46cecb5951b6c3fee)
Notes
Notes (review): Code-Review+2: Alex Schultz <aschultz@redhat.com> Workflow+1: Alex Schultz <aschultz@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 16 Jun 2017 23:25:16 +0000 Reviewed-on: https://review.openstack.org/473736 Project: openstack/tripleo-heat-templates Branch: refs/heads/stable/ocata
-rw-r--r--puppet/services/pacemaker_remote.yaml38
1 files changed, 38 insertions, 0 deletions
diff --git a/puppet/services/pacemaker_remote.yaml b/puppet/services/pacemaker_remote.yaml
index daee43e..64baef3 100644
--- a/puppet/services/pacemaker_remote.yaml
+++ b/puppet/services/pacemaker_remote.yaml
@@ -26,6 +26,42 @@ parameters:
26 MonitoringSubscriptionPacemakerRemote: 26 MonitoringSubscriptionPacemakerRemote:
27 default: 'overcloud-pacemaker_remote' 27 default: 'overcloud-pacemaker_remote'
28 type: string 28 type: string
29 EnableFencing:
30 default: false
31 description: Whether to enable fencing in Pacemaker or not.
32 type: boolean
33 FencingConfig:
34 default: {}
35 description: |
36 Pacemaker fencing configuration. The JSON should have
37 the following structure:
38 {
39 "devices": [
40 {
41 "agent": "AGENT_NAME",
42 "host_mac": "HOST_MAC_ADDRESS",
43 "params": {"PARAM_NAME": "PARAM_VALUE"}
44 }
45 ]
46 }
47 For instance:
48 {
49 "devices": [
50 {
51 "agent": "fence_xvm",
52 "host_mac": "52:54:00:aa:bb:cc",
53 "params": {
54 "multicast_address": "225.0.0.12",
55 "port": "baremetal_0",
56 "manage_fw": true,
57 "manage_key_file": true,
58 "key_file": "/etc/fence_xvm.key",
59 "key_file_password": "abcdef"
60 }
61 }
62 ]
63 }
64 type: json
29 PacemakerRemoteLoggingSource: 65 PacemakerRemoteLoggingSource:
30 type: json 66 type: json
31 default: 67 default:
@@ -52,6 +88,8 @@ outputs:
52 proto: 'tcp' 88 proto: 'tcp'
53 dport: 89 dport:
54 - 3121 90 - 3121
91 tripleo::fencing::config: {get_param: FencingConfig}
92 enable_fencing: {get_param: EnableFencing}
55 tripleo::profile::base::pacemaker_remote::remote_authkey: {get_param: PacemakerRemoteAuthkey} 93 tripleo::profile::base::pacemaker_remote::remote_authkey: {get_param: PacemakerRemoteAuthkey}
56 step_config: | 94 step_config: |
57 include ::tripleo::profile::base::pacemaker_remote 95 include ::tripleo::profile::base::pacemaker_remote