Skip to content

Commit babdc32

Browse files
committed
fully remove puppetdb management from nebula
Previously puppetdb was commented out, and tests were disabled with xit.
1 parent 44a9249 commit babdc32

File tree

4 files changed

+6
-29
lines changed

4 files changed

+6
-29
lines changed

manifests/profile/puppet/db.pp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,5 @@
77
# @example
88
# include nebula::profile::puppet::db
99
class nebula::profile::puppet::db {
10-
#class { 'puppetdb':
11-
# disable_cleartext => true,
12-
# manage_firewall => false,
13-
#}
10+
# puppetdb is no longer managed by nebula
1411
}

manifests/profile/puppet/master_with_db.pp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,5 @@
99
class nebula::profile::puppet::master_with_db (
1010
String $puppetdb_server = lookup('nebula::puppetdb'),
1111
) {
12-
# class { 'puppetdb::master::config':
13-
# puppetdb_server => $puppetdb_server,
14-
# manage_report_processor => true,
15-
# enable_reports => true,
16-
# }
12+
# puppetdb is no longer managed by nebula
1713
}

spec/classes/profile/puppet/db_spec.rb

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@
1010
context "on #{os}" do
1111
let(:facts) { os_facts }
1212

13-
xit do
14-
expect(subject).to contain_class('puppetdb').with(
15-
disable_cleartext: true,
16-
manage_firewall: false,
17-
)
13+
it do
14+
expect(subject).not_to contain_class('puppetdb')
1815
end
1916
end
2017
end

spec/classes/profile/puppet/master_with_db_spec.rb

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,8 @@
1010
context "on #{os}" do
1111
let(:facts) { os_facts }
1212

13-
xit do
14-
expect(subject).to contain_class('puppetdb::master::config').with(
15-
puppetdb_server: 'puppetdb.default.invalid',
16-
manage_report_processor: true,
17-
enable_reports: true,
18-
)
19-
end
20-
21-
context 'when given a puppetdb_server of db.puppet.gov' do
22-
let(:params) { { puppetdb_server: 'db.puppet.gov' } }
23-
24-
xit do
25-
expect(subject).to contain_class('puppetdb::master::config')
26-
.with_puppetdb_server('db.puppet.gov')
27-
end
13+
it do
14+
expect(subject).not_to contain_class('puppetdb::master::config')
2815
end
2916
end
3017
end

0 commit comments

Comments
 (0)