[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetdb: absent the debian-shipped config file

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: puppetdb: absent the debian-shipped config file
..


puppetdb: absent the debian-shipped config file

Change-Id: I8fe0338dafdf080afe99a73a0bf9a144cd3a3a40
---
M modules/puppetmaster/manifests/puppetdb.pp
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git a/modules/puppetmaster/manifests/puppetdb.pp 
b/modules/puppetmaster/manifests/puppetdb.pp
index aee49f2..ce7b75a 100644
--- a/modules/puppetmaster/manifests/puppetdb.pp
+++ b/modules/puppetmaster/manifests/puppetdb.pp
@@ -44,6 +44,12 @@
 require => Package['puppetdb']
 }
 
+# Ensure the default debian config file is not there
+
+file { '/etc/puppetdb/conf.d/config.ini':
+ensure => absent,
+}
+
 $default_db_settings = {
 'classname'   => 'org.postgresql.Driver',
 'subprotocol' => 'postgresql',

-- 
To view, visit https://gerrit.wikimedia.org/r/310742
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8fe0338dafdf080afe99a73a0bf9a144cd3a3a40
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetdb: absent the debian-shipped config file

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/310742

Change subject: puppetdb: absent the debian-shipped config file
..

puppetdb: absent the debian-shipped config file

Change-Id: I8fe0338dafdf080afe99a73a0bf9a144cd3a3a40
---
M modules/puppetmaster/manifests/puppetdb.pp
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/310742/1

diff --git a/modules/puppetmaster/manifests/puppetdb.pp 
b/modules/puppetmaster/manifests/puppetdb.pp
index aee49f2..ce7b75a 100644
--- a/modules/puppetmaster/manifests/puppetdb.pp
+++ b/modules/puppetmaster/manifests/puppetdb.pp
@@ -44,6 +44,12 @@
 require => Package['puppetdb']
 }
 
+# Ensure the default debian config file is not there
+
+file { '/etc/puppetdb/conf.d/config.ini':
+ensure => absent,
+}
+
 $default_db_settings = {
 'classname'   => 'org.postgresql.Driver',
 'subprotocol' => 'postgresql',

-- 
To view, visit https://gerrit.wikimedia.org/r/310742
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fe0338dafdf080afe99a73a0bf9a144cd3a3a40
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits