diff options
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/controller-puppet.yaml | 18 | ||||
| -rw-r--r-- | puppet/hieradata/controller.yaml | 4 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 38 |
3 files changed, 37 insertions, 23 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index c3efc82e..007c7103 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -59,9 +59,6 @@ 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. @@ -70,6 +67,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: | @@ -309,6 +311,9 @@ parameters: NtpServer: type: string default: '' + PcsdPassword: + type: string + description: The password for the 'pcsd' user. PublicVirtualInterface: default: 'br-ex' description: > @@ -436,7 +441,6 @@ 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: @@ -516,6 +520,7 @@ resources: - {get_param: VirtualIP} - ':5000/v2.0/' enable_galera: {get_param: EnableGalera} + enable_pacemaker: {get_param: EnablePacemaker} mysql_innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize} mysql_root_password: {get_param: MysqlRootPassword} mysql_cluster_name: @@ -569,6 +574,7 @@ resources: - - 'mysql://nova:unset@' - {get_param: VirtualIP} - '/nova' + pcsd_password: {get_param: PcsdPassword} rabbit_hosts: str_replace: template: '["host"]' @@ -627,8 +633,8 @@ resources: controller_host: {get_input: controller_host} #local-ipv4 # Pacemaker - corosync::authkey: {get_input: corosync_auth_key} - corosync::bind_address: {get_input: controller_host} + enable_pacemaker: {get_input: enable_pacemaker} + hacluster_pwd: {get_input: pcsd_password} # Swift swift::proxy::proxy_local_net_ip: {get_input: controller_host} diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml index 11ec5e27..d7e515ac 100644 --- a/puppet/hieradata/controller.yaml +++ b/puppet/hieradata/controller.yaml @@ -73,8 +73,8 @@ heat::engine::configure_delegated_roles: false heat::engine::trusts_delegated_roles: [] # pacemaker -corosync::authkey_source: 'string' -corosync::multicast_address: broadcast +pacemaker::corosync::cluster_name: 'tripleo_cluster' +pacemaker::corosync::manage_fw: false mysql::server::manage_config_file: true diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 0d57dc6f..08f9d427 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -27,25 +27,33 @@ if !str2bool(hiera('enable_package_install', 'false')) { if hiera('step') >= 1 { $controller_node_ips = split(hiera('controller_node_ips'), ',') + $enable_pacemaker = str2bool(hiera('enable_pacemaker')) + $enable_keepalived = !$enable_pacemaker + class { '::tripleo::loadbalancer' : controller_hosts => $controller_node_ips, } - class { '::corosync': - quorum_members => $controller_node_ips, - } - corosync::service { 'pacemaker': - version => '0', - } - service { 'pacemaker': - ensure => running, - require => Service['corosync'], - } - cs_property { 'stonith-enabled': - value => 'false', - } - cs_property { 'no-quorum-policy': - value => 'ignore', + if $enable_pacemaker { + $pacemaker_cluster_members = regsubst(hiera('controller_node_ips'), ',', ' ', 'G') + if $::hostname == downcase(hiera('bootstrap_nodeid')) { + $pacemaker_master = true + } else { + $pacemaker_master = false + } + user { 'hacluster': + ensure => present, + } -> + class { '::pacemaker': + hacluster_pwd => hiera('hacluster_pwd'), + } -> + class { '::pacemaker::corosync': + cluster_members => $pacemaker_cluster_members, + setup_cluster => $pacemaker_master, + } + class { '::pacemaker::stonith': + disable => true, + } } } |