diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-04-21 10:57:51 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-04-21 10:57:51 +0000 |
commit | 5513b5e61c3c26b883d1ab7a9b356bb01d881101 (patch) | |
tree | a022adc88a6686709a8af9647bc8c4c2866fa916 /overcloud-without-mergepy.yaml | |
parent | b096c3225eec3f87ca795a377af917b0dead9ba3 (diff) | |
parent | f7826b8a3a083a1776c5f1f02526232a3bf32d4d (diff) |
Merge "Perform basic setup of Pacemaker cluster using puppet-pacemaker"
Diffstat (limited to 'overcloud-without-mergepy.yaml')
-rw-r--r-- | overcloud-without-mergepy.yaml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index f61536ca..32dc9709 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -263,6 +263,11 @@ parameters: default: true description: Whether to use Galera instead of regular MariaDB. type: boolean + EnablePacemaker: + default: true + description: If enabled services will be monitored by Pacemaker; it + will manage VIPs as well, in place of Keepalived. + type: boolean ExtraConfig: default: {} description: | @@ -516,10 +521,10 @@ resources: HeatAuthEncryptionKey: type: OS::Heat::RandomString - CorosyncAuthKey: + PcsdPassword: type: OS::Heat::RandomString properties: - length: 128 + length: 16 Controller: type: OS::Heat::ResourceGroup @@ -540,9 +545,9 @@ resources: CloudName: {get_param: CloudName} ControlVirtualInterface: {get_param: ControlVirtualInterface} ControllerExtraConfig: {get_param: controllerExtraConfig} - CorosyncAuthKey: {get_resource: CorosyncAuthKey} Debug: {get_param: Debug} EnableGalera: {get_param: EnableGalera} + EnablePacemaker: {get_param: EnablePacemaker} ExtraConfig: {get_param: ExtraConfig} Flavor: {get_param: OvercloudControlFlavor} GlancePort: {get_param: GlancePort} @@ -583,6 +588,7 @@ resources: NeutronTunnelTypes: {get_param: NeutronTunnelTypes} NovaPassword: {get_param: NovaPassword} NtpServer: {get_param: NtpServer} + PcsdPassword: {get_resource: PcsdPassword} PublicVirtualInterface: {get_param: PublicVirtualInterface} RabbitPassword: {get_param: RabbitPassword} RabbitUserName: {get_param: RabbitUserName} |