Ayounsi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404504 )
Change subject: Netbox: remove tunning.conf include; PGSQL fix 9.6 deprecated
option
......................................................................
Netbox: remove tunning.conf include; PGSQL fix 9.6 deprecated option
Bug: T184634
Change-Id: I339463287a9d697cfdd6bf087493132ad4056556
---
M modules/postgresql/templates/master.conf.erb
M modules/profile/manifests/netbox.pp
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Ayounsi: Looks good to me, approved
Zoranzoki21: Looks good to me, but someone else must approve
Volans: Looks good to me, but someone else must approve
diff --git a/modules/postgresql/templates/master.conf.erb
b/modules/postgresql/templates/master.conf.erb
index 43a0985..7b56948 100644
--- a/modules/postgresql/templates/master.conf.erb
+++ b/modules/postgresql/templates/master.conf.erb
@@ -1,5 +1,7 @@
# replication master
wal_level = hot_standby
max_wal_senders = <%= @max_wal_senders %>
+<% if @pgversion.to_f < 9.6 %>
checkpoint_segments = <%= @checkpoint_segments %>
+<% end %>
wal_keep_segments = <%= @wal_keep_segments %>
diff --git a/modules/profile/manifests/netbox.pp
b/modules/profile/manifests/netbox.pp
index 244d5a2..90b659f 100644
--- a/modules/profile/manifests/netbox.pp
+++ b/modules/profile/manifests/netbox.pp
@@ -41,7 +41,6 @@
# We do this for the require in postgres::db
$require_class = 'postgresql::master'
class { '::postgresql::master':
- includes => ['tuning.conf'],
root_dir => '/srv/postgres',
use_ssl => true,
}
@@ -49,7 +48,6 @@
} else {
$require_class = 'postgresql::slave'
class { '::postgresql::slave':
- includes => ['tuning.conf'],
master_server => $master,
root_dir => '/srv/postgres',
replication_pass => $replication_pass,
--
To view, visit https://gerrit.wikimedia.org/r/404504
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I339463287a9d697cfdd6bf087493132ad4056556
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi <ayou...@wikimedia.org>
Gerrit-Reviewer: Ayounsi <ayou...@wikimedia.org>
Gerrit-Reviewer: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: Zoranzoki21 <zorandori4...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
