openstack
/
puppet-pacemaker
Code Issues Proposed changes

Remove support for CentOS6/RHEL6 

... because they are really old now, and we don't expect any users
try installing OpenStack on them.

Change-Id: Ica78a1f231ef5691e01e1a4e08110b7cee62c87e
This commit is contained in:
Takashi Kajinami 2020-04-07 19:06:32 +09:00
parent 1c79e4d61f
commit 01f9a6912c
4 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/new/params.pp
View File

@ -8,17 +8,8 @@ class pacemaker::new::params {
$minor = $::os['release']['minor']
if $::os['family'] == 'RedHat' {
if $major >= '7' {
$package_list = ['pacemaker', 'pcs', 'fence-agents-all', 'pacemaker-libs']
$pcsd_mode = true
} else {
$package_list = ['pacemaker', 'pcs', 'fence-agents', 'cman']
if $major == '6' and $minor >= '6' {
$pcsd_mode = true
} else {
$pcsd_mode = false
}
}
$package_list = ['pacemaker', 'pcs', 'fence-agents-all', 'pacemaker-libs']
$pcsd_mode = true
$cluster_user = 'hacluster'
$cluster_group = 'haclient'
$log_file_path = '/var/log/cluster/corosync.log'

19
manifests/params.pp
View File

@ -32,19 +32,12 @@ class pacemaker::params {
$hacluster_pwd = 'CHANGEME'
case downcase($::facts['os']['family']) {
'redhat': {
$pcs_bin = '/sbin/pcs'
$pcsd_sysconfig = '/etc/sysconfig/pcsd'
$pcmk_sysconfig = '/etc/sysconfig/pacemaker'
if (versioncmp($::os['release']['full'], '7.0') < 0) {
$package_list = ['pacemaker','pcs','fence-agents','cman']
# TODO in el6.6, $pcsd_mode should be true
$pcsd_mode = false
$services_manager = 'lsb'
} else {
$package_list = ['pacemaker','pcs','fence-agents-all','pacemaker-libs']
$pcsd_mode = true
$services_manager = 'systemd'
}
$pcs_bin = '/sbin/pcs'
$pcsd_sysconfig = '/etc/sysconfig/pcsd'
$pcmk_sysconfig = '/etc/sysconfig/pacemaker'
$package_list = ['pacemaker','pcs','fence-agents-all','pacemaker-libs']
$pcsd_mode = true
$services_manager = 'systemd'
# Starting with 7.3 we have a separate pacemaker-remote package
if (versioncmp($::os['release']['full'], '7.2') < 1) {
$pcmk_remote_package_list = ['pacemaker','pcs','fence-agents-all','pacemaker-libs']

6
spec/classes/pacemaker_install_spec.rb
View File

@ -7,11 +7,7 @@ describe 'pacemaker::new::install', type: :class do
package_list = begin
if facts[:osfamily] == 'RedHat'
if facts[:operatingsystemmajrelease].to_i >= 7
%w(pacemaker pcs fence-agents-all pacemaker-libs)
else
%w(pacemaker pcs fence-agents cman)
end
%w(pacemaker pcs fence-agents-all pacemaker-libs)
elsif facts[:osfamily] == 'Debian'
if facts[:operatingsystem] == 'Ubuntu' && facts[:operatingsystemmajrelease].to_i >= 16
%w(pacemaker corosync pacemaker-cli-utils resource-agents)

2
spec/classes/pacemaker_setup_spec.rb
View File

@ -23,7 +23,7 @@ describe 'pacemaker::new::setup', type: :class do
major = release.first
minor = release.last
if facts[:osfamily] == 'RedHat' and ( (major == '8') or (major == '7') or (minor == '6' and major.to_i >= 6) )
if facts[:osfamily] == 'RedHat'
it { is_expected.to contain_class('pacemaker::new::setup::pcsd') }
else
it { is_expected.to contain_class('pacemaker::new::setup::config') }