[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetdb: Allow tuning.conf to have a different shared_buffe...

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333473 )

Change subject: puppetdb: Allow tuning.conf to have a different shared_buffers 
value
..


puppetdb: Allow tuning.conf to have a different shared_buffers value

Bug: T72792
Bug: T153163
Change-Id: Ic26a157d323c5945ad6a177c8669b23cbbe4d10c
---
M modules/role/manifests/puppetmaster/puppetdb.pp
R modules/role/templates/puppetdb/tuning.conf.erb
2 files changed, 9 insertions(+), 7 deletions(-)

Approvals:
  Tim Landscheidt: Looks good to me, but someone else must approve
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/role/manifests/puppetmaster/puppetdb.pp 
b/modules/role/manifests/puppetmaster/puppetdb.pp
index 69ef1d3..2db8c1b 100644
--- a/modules/role/manifests/puppetmaster/puppetdb.pp
+++ b/modules/role/manifests/puppetmaster/puppetdb.pp
@@ -1,4 +1,6 @@
-class role::puppetmaster::puppetdb {
+class role::puppetmaster::puppetdb (
+$shared_buffers = '7680MB'
+) {
 include standard
 include ::base::firewall
 include ::passwords::postgres
@@ -56,11 +58,11 @@
 
 # Tuning
 file { '/etc/postgresql/9.4/main/tuning.conf':
-ensure => 'present',
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
-source => 'puppet:///modules/role/puppetdb/tuning.conf',
+ensure  => 'present',
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+content => template('role/puppetdb/tuning.conf.erb'),
 }
 
 sysctl::parameters { 'postgres_shmem':
diff --git a/modules/role/files/puppetdb/tuning.conf 
b/modules/role/templates/puppetdb/tuning.conf.erb
similarity index 77%
rename from modules/role/files/puppetdb/tuning.conf
rename to modules/role/templates/puppetdb/tuning.conf.erb
index 8c8431c..59bddc7 100644
--- a/modules/role/files/puppetdb/tuning.conf
+++ b/modules/role/templates/puppetdb/tuning.conf.erb
@@ -3,5 +3,5 @@
 effective_cache_size = 8GB
 work_mem = 192MB
 wal_buffers = 8MB
-shared_buffers = 7680MB
+shared_buffers = <%= @shared_buffers %>
 max_connections = 120

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic26a157d323c5945ad6a177c8669b23cbbe4d10c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Tim Landscheidt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetdb: Allow tuning.conf to have a different shared_buffe...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333473 )

Change subject: puppetdb: Allow tuning.conf to have a different shared_buffers 
value
..

puppetdb: Allow tuning.conf to have a different shared_buffers value

Bug: T72792
Bug: T153163
Change-Id: Ic26a157d323c5945ad6a177c8669b23cbbe4d10c
---
M modules/role/manifests/puppetmaster/puppetdb.pp
R modules/role/templates/puppetdb/tuning.conf.erb
2 files changed, 9 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/73/333473/1

diff --git a/modules/role/manifests/puppetmaster/puppetdb.pp 
b/modules/role/manifests/puppetmaster/puppetdb.pp
index 69ef1d3..2db8c1b 100644
--- a/modules/role/manifests/puppetmaster/puppetdb.pp
+++ b/modules/role/manifests/puppetmaster/puppetdb.pp
@@ -1,4 +1,6 @@
-class role::puppetmaster::puppetdb {
+class role::puppetmaster::puppetdb (
+$shared_buffers = '7680MB'
+) {
 include standard
 include ::base::firewall
 include ::passwords::postgres
@@ -56,11 +58,11 @@
 
 # Tuning
 file { '/etc/postgresql/9.4/main/tuning.conf':
-ensure => 'present',
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
-source => 'puppet:///modules/role/puppetdb/tuning.conf',
+ensure  => 'present',
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+content => template('role/puppetdb/tuning.conf.erb'),
 }
 
 sysctl::parameters { 'postgres_shmem':
diff --git a/modules/role/files/puppetdb/tuning.conf 
b/modules/role/templates/puppetdb/tuning.conf.erb
similarity index 77%
rename from modules/role/files/puppetdb/tuning.conf
rename to modules/role/templates/puppetdb/tuning.conf.erb
index 8c8431c..59bddc7 100644
--- a/modules/role/files/puppetdb/tuning.conf
+++ b/modules/role/templates/puppetdb/tuning.conf.erb
@@ -3,5 +3,5 @@
 effective_cache_size = 8GB
 work_mem = 192MB
 wal_buffers = 8MB
-shared_buffers = 7680MB
+shared_buffers = <%= @shared_buffers %>
 max_connections = 120

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic26a157d323c5945ad6a177c8669b23cbbe4d10c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

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