Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: puppetmaster::puppetdb: further fixes to users definitions
......................................................................
puppetmaster::puppetdb: further fixes to users definitions
Change-Id: Ib968bed5321209393a3b2884a3616aed39a2b6a7
---
M hieradata/common/puppetmaster/puppetdb.yaml
M modules/puppetmaster/manifests/puppetdb/database.pp
2 files changed, 9 insertions(+), 5 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/common/puppetmaster/puppetdb.yaml
b/hieradata/common/puppetmaster/puppetdb.yaml
index fff11ab..7c82677 100644
--- a/hieradata/common/puppetmaster/puppetdb.yaml
+++ b/hieradata/common/puppetmaster/puppetdb.yaml
@@ -1,11 +1,14 @@
postgres_users:
replication@nihal-v4:
user: replication
+ database: replication
password: "%{::puppetmaster::puppetdb::database::replication_pass}"
cidr: 10.192.16.184/32
pgversion: 9.4
+ attrs: REPLICATION
puppetdb@nihal-v4:
user: puppetdb
+ database: puppetdb
password: "%{::puppetmaster::puppetdb::database::puppetdb_pass}"
cidr: 10.192.16.184/32
pgversion: 9.4
diff --git a/modules/puppetmaster/manifests/puppetdb/database.pp
b/modules/puppetmaster/manifests/puppetdb/database.pp
index 73e8883..110bfbb 100644
--- a/modules/puppetmaster/manifests/puppetdb/database.pp
+++ b/modules/puppetmaster/manifests/puppetdb/database.pp
@@ -30,11 +30,12 @@
# Create the puppetdb user for localhost
# This works on every server and is used for read-only db lookups
postgresql::user { 'puppetdb@localhost':
- ensure => present,
- user => 'puppetdb',
- password => $puppetdb_pass,
- cidr => $::main_ipaddress,
- database => 'puppetdb',
+ ensure => present,
+ user => 'puppetdb',
+ database => 'puppetdb',
+ password => $puppetdb_pass,
+ cidr => "${::main_ipaddress}/32",
+ pgversion => '9.4',
}
# Create the database
--
To view, visit https://gerrit.wikimedia.org/r/304461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib968bed5321209393a3b2884a3616aed39a2b6a7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
