diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-04-16 08:22:42 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-04-16 08:22:42 +0000 |
commit | 49c1b3a1d4db826f3fc21ef90f82c584937cefc2 (patch) | |
tree | 191ac3a83a7dd6ff46c0de412260e649384bc08f /puppet/controller-puppet.yaml | |
parent | bdaeca208cdb879a6875c74a6324af677da95449 (diff) | |
parent | 5963c9a58aeba728eb067295520685a87713fca1 (diff) |
Merge "Perform basic setup of pacemaker cluster on controllers"
Diffstat (limited to 'puppet/controller-puppet.yaml')
-rw-r--r-- | puppet/controller-puppet.yaml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index f9f40a52..c3efc82e 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -59,6 +59,9 @@ parameters: default: 'br-ex' description: Interface where virtual ip will be assigned. type: string + CorosyncAuthKey: + description: Auth encryption key for corosync + type: string Debug: default: '' description: Set to True to enable debugging on all services. @@ -433,6 +436,7 @@ resources: bootstack_nodeid: {get_attr: [Controller, name]} controller_host: {get_attr: [Controller, networks, ctlplane, 0]} controller_virtual_ip: {get_param: VirtualIP} + corosync_auth_key: {get_param: CorosyncAuthKey} neutron_enable_tunneling: {get_param: NeutronEnableTunnelling} heat.watch_server_url: list_join: @@ -622,6 +626,10 @@ resources: bootstack_nodeid: {get_input: bootstack_nodeid} controller_host: {get_input: controller_host} #local-ipv4 + # Pacemaker + corosync::authkey: {get_input: corosync_auth_key} + corosync::bind_address: {get_input: controller_host} + # Swift swift::proxy::proxy_local_net_ip: {get_input: controller_host} swift::proxy::authtoken::auth_uri: {get_input: keystone_auth_uri} |