Yuvipanda has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332104 )
Change subject: postgresql module: Linting changes
......................................................................
postgresql module: Linting changes
Use full names for class names, as relative names are not allowed in
future Puppet versions
Quote values in selectors
Add missing trailing comma
Bug: T93645
Change-Id: If0b97e0ee2f597f479e48861c45d6cbf50100fd2
---
M modules/postgresql/manifests/dirs.pp
M modules/postgresql/manifests/master.pp
M modules/postgresql/manifests/packages.pp
M modules/postgresql/manifests/postgis.pp
M modules/postgresql/manifests/server.pp
M modules/postgresql/manifests/slave.pp
M modules/postgresql/manifests/user.pp
M modules/postgresql/tests/ganglia.pp
M modules/postgresql/tests/master.pp
M modules/postgresql/tests/postgis.pp
M modules/postgresql/tests/server.pp
M modules/postgresql/tests/slave.pp
M modules/postgresql/tests/spatial.pp
M modules/postgresql/tests/user.pp
14 files changed, 37 insertions(+), 37 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/postgresql/manifests/dirs.pp
b/modules/postgresql/manifests/dirs.pp
index a4948c8..ccc32d3 100644
--- a/modules/postgresql/manifests/dirs.pp
+++ b/modules/postgresql/manifests/dirs.pp
@@ -26,9 +26,9 @@
#
class postgresql::dirs(
$pgversion = $::lsbdistcodename ? {
- jessie => '9.4',
- precise => '9.1',
- trusty => '9.3',
+ 'jessie' => '9.4',
+ 'precise' => '9.1',
+ 'trusty' => '9.3',
},
$ensure = 'present',
$root_dir = '/var/lib/postgresql',
diff --git a/modules/postgresql/manifests/master.pp
b/modules/postgresql/manifests/master.pp
index 6b3b554..dd86259 100644
--- a/modules/postgresql/manifests/master.pp
+++ b/modules/postgresql/manifests/master.pp
@@ -38,9 +38,9 @@
$master_server=$::fqdn,
$includes=[],
$pgversion = $::lsbdistcodename ? {
- jessie => '9.4',
- precise => '9.1',
- trusty => '9.3',
+ 'jessie' => '9.4',
+ 'precise' => '9.1',
+ 'trusty' => '9.3',
},
$ensure='present',
$max_wal_senders=5,
@@ -53,7 +53,7 @@
$data_dir = "${root_dir}/${pgversion}/main"
- class { 'postgresql::server':
+ class { '::postgresql::server':
ensure => $ensure,
pgversion => $pgversion,
includes => [ $includes, 'master.conf'],
diff --git a/modules/postgresql/manifests/packages.pp
b/modules/postgresql/manifests/packages.pp
index cefed50..4d88cc2 100644
--- a/modules/postgresql/manifests/packages.pp
+++ b/modules/postgresql/manifests/packages.pp
@@ -22,9 +22,9 @@
#
class postgresql::packages(
$pgversion = $::lsbdistcodename ? {
- jessie => '9.4',
- precise => '9.1',
- trusty => '9.3',
+ 'jessie' => '9.4',
+ 'precise' => '9.1',
+ 'trusty' => '9.3',
},
$ensure = 'present',
) {
diff --git a/modules/postgresql/manifests/postgis.pp
b/modules/postgresql/manifests/postgis.pp
index 6eae8b4..864b680 100644
--- a/modules/postgresql/manifests/postgis.pp
+++ b/modules/postgresql/manifests/postgis.pp
@@ -15,15 +15,15 @@
class postgresql::postgis(
$ensure = 'present',
$postgresql_postgis_package = $::lsbdistcodename ? {
- jessie => 'postgresql-9.4-postgis-2.3',
- precise => 'postgresql-9.1-postgis',
- trusty => 'postgresql-9.3-postgis-2.1',
+ 'jessie' => 'postgresql-9.4-postgis-2.3',
+ 'precise' => 'postgresql-9.1-postgis',
+ 'trusty' => 'postgresql-9.3-postgis-2.1',
},
$install_postgis_scripts = $::lsbdistcodename ? {
- jessie => true,
- precise => false,
- trusty => true,
- default => true,
+ 'jessie' => true,
+ 'precise' => false,
+ 'trusty' => true,
+ default => true,
},
) {
validate_bool($install_postgis_scripts)
diff --git a/modules/postgresql/manifests/server.pp
b/modules/postgresql/manifests/server.pp
index 49d4572..1a9ac0e 100644
--- a/modules/postgresql/manifests/server.pp
+++ b/modules/postgresql/manifests/server.pp
@@ -29,9 +29,9 @@
#
class postgresql::server(
$pgversion = $::lsbdistcodename ? {
- jessie => '9.4',
- precise => '9.1',
- trusty => '9.3',
+ 'jessie' => '9.4',
+ 'precise' => '9.1',
+ 'trusty' => '9.3',
},
$ensure = 'present',
$includes = [],
@@ -50,8 +50,8 @@
$data_dir = "${root_dir}/${pgversion}/main"
$service_name = $::lsbdistcodename ? {
- jessie => "postgresql@${pgversion}-main",
- default => 'postgresql'
+ 'jessie' => "postgresql@${pgversion}-main",
+ default => 'postgresql',
}
exec { 'pgreload':
command => "/usr/bin/pg_ctlcluster ${pgversion} main reload",
diff --git a/modules/postgresql/manifests/slave.pp
b/modules/postgresql/manifests/slave.pp
index 8e72661..82bfa67 100644
--- a/modules/postgresql/manifests/slave.pp
+++ b/modules/postgresql/manifests/slave.pp
@@ -33,9 +33,9 @@
$replication_pass,
$includes=[],
$pgversion = $::lsbdistcodename ? {
- jessie => '9.4',
- precise => '9.1',
- trusty => '9.3',
+ 'jessie' => '9.4',
+ 'precise' => '9.1',
+ 'trusty' => '9.3',
},
$ensure='present',
$root_dir='/var/lib/postgresql',
@@ -45,7 +45,7 @@
$data_dir = "${root_dir}/${pgversion}/main"
- class { 'postgresql::server':
+ class { '::postgresql::server':
ensure => $ensure,
pgversion => $pgversion,
includes => [ $includes, 'slave.conf'],
diff --git a/modules/postgresql/manifests/user.pp
b/modules/postgresql/manifests/user.pp
index 327fb74..ab6e75a 100644
--- a/modules/postgresql/manifests/user.pp
+++ b/modules/postgresql/manifests/user.pp
@@ -32,9 +32,9 @@
$method = 'md5',
$cidr = '127.0.0.1/32',
$pgversion = $::lsbdistcodename ? {
- jessie => '9.4',
- precise => '9.1',
- trusty => '9.3',
+ 'jessie' => '9.4',
+ 'precise' => '9.1',
+ 'trusty' => '9.3',
},
$attrs = '',
$master = true,
diff --git a/modules/postgresql/tests/ganglia.pp
b/modules/postgresql/tests/ganglia.pp
index a07942d..c331090 100644
--- a/modules/postgresql/tests/ganglia.pp
+++ b/modules/postgresql/tests/ganglia.pp
@@ -1,7 +1,7 @@
#
-include postgresql::server
-class {'postgresql::ganglia':
+include ::postgresql::server
+class {'::postgresql::ganglia':
pgstats_user => 'test',
pgstats_pass => 'test',
}
diff --git a/modules/postgresql/tests/master.pp
b/modules/postgresql/tests/master.pp
index 70946e0..0109f41 100644
--- a/modules/postgresql/tests/master.pp
+++ b/modules/postgresql/tests/master.pp
@@ -1,3 +1,3 @@
#
-include postgresql::master
+include ::postgresql::master
diff --git a/modules/postgresql/tests/postgis.pp
b/modules/postgresql/tests/postgis.pp
index ddc41d9..31054f4 100644
--- a/modules/postgresql/tests/postgis.pp
+++ b/modules/postgresql/tests/postgis.pp
@@ -1,3 +1,3 @@
#
-include postgresql::postgis
+include ::postgresql::postgis
diff --git a/modules/postgresql/tests/server.pp
b/modules/postgresql/tests/server.pp
index 722e7e0..e618d09 100644
--- a/modules/postgresql/tests/server.pp
+++ b/modules/postgresql/tests/server.pp
@@ -1,3 +1,3 @@
#
-include postgresql::server
+include ::postgresql::server
diff --git a/modules/postgresql/tests/slave.pp
b/modules/postgresql/tests/slave.pp
index 184e3df..b3b71f8 100644
--- a/modules/postgresql/tests/slave.pp
+++ b/modules/postgresql/tests/slave.pp
@@ -1,6 +1,6 @@
#
-class {'postgresql::slave':
+class {'::postgresql::slave':
master_server => 'test',
replication_pass => 'pass',
}
diff --git a/modules/postgresql/tests/spatial.pp
b/modules/postgresql/tests/spatial.pp
index 1ec3963..548133e 100644
--- a/modules/postgresql/tests/spatial.pp
+++ b/modules/postgresql/tests/spatial.pp
@@ -1,4 +1,4 @@
#
-include postgresql::server
+include ::postgresql::server
postgresql::spatialdb { 'gis': }
diff --git a/modules/postgresql/tests/user.pp b/modules/postgresql/tests/user.pp
index 44e2050..e8ac423 100644
--- a/modules/postgresql/tests/user.pp
+++ b/modules/postgresql/tests/user.pp
@@ -1,6 +1,6 @@
#
-include postgresql::server
+include ::postgresql::server
postgresql::user { 'testuser':
ensure => 'present',
user => 'testuser',
--
To view, visit https://gerrit.wikimedia.org/r/332104
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If0b97e0ee2f597f479e48861c45d6cbf50100fd2
Gerrit-PatchSet: 10
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Juniorsys <juniorsys_wikime...@outlook.com>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
