Skip to content

Commit e56eb99

Browse files
kbarberkbarber
committed
Merge pull request #156 from ajroetker/maint_prune_old_pe_code
(maint) Prune dead PE code
2 parents 5fb9e8e + 3614812 commit e56eb99

3 files changed

Lines changed: 43 additions & 90 deletions

File tree

‎manifests/params.pp‎

Lines changed: 25 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -72,58 +72,33 @@
7272
}
7373
}
7474

75-
if defined('$is_pe') and str2bool($::is_pe) == true {
76-
$puppetdb_package = 'pe-puppetdb'
77-
$puppetdb_service = 'pe-puppetdb'
78-
$puppetdb_user = 'pe-puppetdb'
79-
$puppetdb_group = 'pe-puppetdb'
80-
$confdir = '/etc/puppetlabs/puppetdb/conf.d'
81-
$puppet_service_name = 'pe-httpd'
82-
$puppet_confdir = '/etc/puppetlabs/puppet'
83-
$terminus_package = 'pe-puppetdb-terminus'
84-
$embedded_subname = 'file:/opt/puppet/share/puppetdb/db/db;hsqldb.tx=mvcc;sql.syntax_pgs=true'
85-
$ssl_dir = '/etc/puppetlabs/puppetdb/ssl'
75+
$puppetdb_package = 'puppetdb'
76+
$puppetdb_service = 'puppetdb'
77+
$puppetdb_user = 'puppetdb'
78+
$puppetdb_group = 'puppetdb'
79+
$confdir = '/etc/puppetdb/conf.d'
80+
$puppet_confdir = '/etc/puppet'
81+
$terminus_package = 'puppetdb-terminus'
82+
$ssl_dir = '/etc/puppetdb/ssl'
8683

87-
case $::osfamily {
88-
'RedHat', 'Suse': {
89-
$puppetdb_initconf = '/etc/sysconfig/pe-puppetdb'
90-
}
91-
'Debian': {
92-
$puppetdb_initconf = '/etc/default/pe-puppetdb'
93-
}
94-
default: {
95-
fail("${module_name} supports osfamily's RedHat and Debian. Your osfamily is recognized as ${::osfamily}")
96-
}
84+
case $::osfamily {
85+
'RedHat', 'Suse', 'Archlinux': {
86+
$puppetdb_initconf = '/etc/sysconfig/puppetdb'
87+
$puppet_service_name = 'puppetmaster'
88+
$embedded_subname = 'file:/var/lib/puppetdb/db/db;hsqldb.tx=mvcc;sql.syntax_pgs=true'
9789
}
98-
} else {
99-
$puppetdb_package = 'puppetdb'
100-
$puppetdb_service = 'puppetdb'
101-
$puppetdb_user = 'puppetdb'
102-
$puppetdb_group = 'puppetdb'
103-
$confdir = '/etc/puppetdb/conf.d'
104-
$puppet_confdir = '/etc/puppet'
105-
$terminus_package = 'puppetdb-terminus'
106-
$ssl_dir = '/etc/puppetdb/ssl'
107-
108-
case $::osfamily {
109-
'RedHat', 'Suse', 'Archlinux': {
110-
$puppetdb_initconf = '/etc/sysconfig/puppetdb'
111-
$puppet_service_name = 'puppetmaster'
112-
$embedded_subname = 'file:/var/lib/puppetdb/db/db;hsqldb.tx=mvcc;sql.syntax_pgs=true'
113-
}
114-
'Debian': {
115-
$puppetdb_initconf = '/etc/default/puppetdb'
116-
$puppet_service_name = 'puppetmaster'
117-
$embedded_subname = 'file:/var/lib/puppetdb/db/db;hsqldb.tx=mvcc;sql.syntax_pgs=true'
118-
}
119-
'OpenBSD': {
120-
$puppetdb_initconf = undef
121-
$puppet_service_name = 'puppetmasterd'
122-
$embedded_subname = 'file:/var/db/puppetdb/db/db;hsqldb.tx=mvcc;sql.syntax_pgs=true'
123-
}
124-
default: {
125-
fail("${module_name} supports osfamily's RedHat and Debian. Your osfamily is recognized as ${::osfamily}")
126-
}
90+
'Debian': {
91+
$puppetdb_initconf = '/etc/default/puppetdb'
92+
$puppet_service_name = 'puppetmaster'
93+
$embedded_subname = 'file:/var/lib/puppetdb/db/db;hsqldb.tx=mvcc;sql.syntax_pgs=true'
94+
}
95+
'OpenBSD': {
96+
$puppetdb_initconf = undef
97+
$puppet_service_name = 'puppetmasterd'
98+
$embedded_subname = 'file:/var/db/puppetdb/db/db;hsqldb.tx=mvcc;sql.syntax_pgs=true'
99+
}
100+
default: {
101+
fail("${module_name} supports osfamily's RedHat and Debian. Your osfamily is recognized as ${::osfamily}")
127102
}
128103
}
129104

‎spec/spec_helper_acceptance.rb‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,25 @@
55
if host['platform'] =~ /debian/
66
on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
77
end
8-
if host.is_pe?
9-
install_pe
10-
else
11-
#install_puppet
12-
if host['platform'] =~ /el-(5|6)/
13-
relver = $1
14-
on host, "rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-el-#{relver}.noarch.rpm"
15-
on host, 'yum install -y puppet puppet-server'
16-
elsif host['platform'] =~ /fedora-(\d+)/
17-
relver = $1
18-
on host, "rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-fedora-#{relver}.noarch.rpm"
19-
on host, 'yum install -y puppet-server'
20-
elsif host['platform'] =~ /(ubuntu|debian)/
21-
if ! host.check_for_package 'curl'
22-
on host, 'apt-get install -y curl'
23-
end
24-
on host, 'curl -O http://apt.puppetlabs.com/puppetlabs-release-$(lsb_release -c -s).deb'
25-
on host, 'dpkg -i puppetlabs-release-$(lsb_release -c -s).deb'
26-
on host, 'apt-get -y -f -m update'
27-
on host, 'apt-get install -y puppet puppetmaster'
28-
else
29-
raise "install_puppet() called for unsupported platform '#{host['platform']}' on '#{host.name}'"
8+
#install_puppet
9+
if host['platform'] =~ /el-(5|6)/
10+
relver = $1
11+
on host, "rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-el-#{relver}.noarch.rpm"
12+
on host, 'yum install -y puppet puppet-server'
13+
elsif host['platform'] =~ /fedora-(\d+)/
14+
relver = $1
15+
on host, "rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-fedora-#{relver}.noarch.rpm"
16+
on host, 'yum install -y puppet-server'
17+
elsif host['platform'] =~ /(ubuntu|debian)/
18+
if ! host.check_for_package 'curl'
19+
on host, 'apt-get install -y curl'
3020
end
21+
on host, 'curl -O http://apt.puppetlabs.com/puppetlabs-release-$(lsb_release -c -s).deb'
22+
on host, 'dpkg -i puppetlabs-release-$(lsb_release -c -s).deb'
23+
on host, 'apt-get -y -f -m update'
24+
on host, 'apt-get install -y puppet puppetmaster'
25+
else
26+
raise "install_puppet() called for unsupported platform '#{host['platform']}' on '#{host.name}'"
3127
end
3228
end
3329

‎spec/unit/classes/server_spec.rb‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,24 +42,6 @@
4242
)}
4343
end
4444

45-
context 'on PE PuppetDB' do
46-
let(:facts) do
47-
basefacts.merge({
48-
:is_pe => 'true',
49-
})
50-
end
51-
it { should contain_ini_subsetting("'-Xms'").
52-
with(
53-
'ensure' => 'present',
54-
'path' => '/etc/sysconfig/pe-puppetdb',
55-
'section' => '',
56-
'key_val_separator' => '=',
57-
'setting' => 'JAVA_ARGS',
58-
'subsetting' => '-Xms',
59-
'value' => '2g'
60-
)}
61-
end
62-
6345
end
6446
end
6547
end

0 commit comments

Comments
 (0)
⚡