subject:"\[MediaWiki\-commits\] \[Gerrit\] operations\/puppet\[production\]\: geowiki module\: Lint changes \+ modes\/umask quoting"

[MediaWiki-commits] [Gerrit] operations/puppet[production]: geowiki module: Lint changes + modes/umask quoting

2017-01-27 Thread Alexandros Kosiaris (Code Review)

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

Change subject: geowiki module: Lint changes + modes/umask quoting
..


geowiki module: Lint changes + modes/umask quoting

Use full names for class names, as relative names are not allowed in
future Puppet versions.

Quote mode and umask values. Unquoted mode values in a File resource
type in later Puppet versions will generate an error, as will unquoted
umask values for Exec resource types.

Bug: T93645

Change-Id: Ica9a6038b8a84293cda8dfadf2f3bf2f05a06a23
---
M modules/geowiki/manifests/job.pp
M modules/geowiki/manifests/job/data.pp
M modules/geowiki/manifests/job/limn.pp
M modules/geowiki/manifests/job/monitoring.pp
M modules/geowiki/manifests/mysql_conf.pp
M modules/geowiki/manifests/private_data.pp
6 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/modules/geowiki/manifests/job.pp b/modules/geowiki/manifests/job.pp
index 7a635cf..6d49d61 100644
--- a/modules/geowiki/manifests/job.pp
+++ b/modules/geowiki/manifests/job.pp
@@ -6,7 +6,7 @@
 
 include ::geowiki::params
 include ::geowiki::mysql_conf
-include geoip
+include ::geoip
 
 # This is not a complete list of
 # python packages that geowiki requires.
diff --git a/modules/geowiki/manifests/job/data.pp 
b/modules/geowiki/manifests/job/data.pp
index 3e7f73a..9ceba53 100644
--- a/modules/geowiki/manifests/job/data.pp
+++ b/modules/geowiki/manifests/job/data.pp
@@ -4,7 +4,7 @@
 # editor geocoding statistics, saved back into a db.
 #
 class geowiki::job::data inherits geowiki::job {
-include passwords::mysql::globaldev
+include ::passwords::mysql::globaldev
 
 # install MySQL conf files for db acccess
 $globaldev_mysql_user = $passwords::mysql::globaldev::user
diff --git a/modules/geowiki/manifests/job/limn.pp 
b/modules/geowiki/manifests/job/limn.pp
index 656e0f9..fb8468b 100644
--- a/modules/geowiki/manifests/job/limn.pp
+++ b/modules/geowiki/manifests/job/limn.pp
@@ -2,7 +2,7 @@
 # Installs a cron job to create limn files from the geocoded editor data.
 #
 class geowiki::job::limn inherits geowiki::job {
-require geowiki::private_data
+require ::geowiki::private_data
 
 git::clone { 'geowiki-data-public':
 ensure=> 'latest',
diff --git a/modules/geowiki/manifests/job/monitoring.pp 
b/modules/geowiki/manifests/job/monitoring.pp
index cd260b6..4c6b1ab 100644
--- a/modules/geowiki/manifests/job/monitoring.pp
+++ b/modules/geowiki/manifests/job/monitoring.pp
@@ -5,7 +5,7 @@
 # Disabled for now due to restructuring of geowiki.
 #
 class geowiki::job::monitoring inherits geowiki::job {
-include passwords::geowiki
+include ::passwords::geowiki
 
 $geowiki_http_user= $passwords::geowiki::user
 $geowiki_http_pass= $passwords::geowiki::pass
diff --git a/modules/geowiki/manifests/mysql_conf.pp 
b/modules/geowiki/manifests/mysql_conf.pp
index 256ba51..b3fa2f6 100644
--- a/modules/geowiki/manifests/mysql_conf.pp
+++ b/modules/geowiki/manifests/mysql_conf.pp
@@ -4,7 +4,7 @@
 #
 class geowiki::mysql_conf {
 include ::geowiki::params
-include passwords::mysql::research
+include ::passwords::mysql::research
 
 $research_mysql_user = $passwords::mysql::research::user
 $research_mysql_pass = $passwords::mysql::research::pass
diff --git a/modules/geowiki/manifests/private_data.pp 
b/modules/geowiki/manifests/private_data.pp
index 25f30a1..84a9534 100644
--- a/modules/geowiki/manifests/private_data.pp
+++ b/modules/geowiki/manifests/private_data.pp
@@ -17,7 +17,7 @@
 # It only needs backup (as the repo is not living in gerrit)
 # Other hosts need to rsync it over
 if $::fqdn == $::geowiki::params::private_data_bare_host {
-include role::backup::host
+include ::role::backup::host
 backup::set { 'a-geowiki-data-private-bare': }
 }
 else {
@@ -37,8 +37,8 @@
 origin=> "file://${::geowiki::params::private_data_bare_path}",
 owner => $::geowiki::params::user,
 group => 'www-data',
-mode  => 0750,
-umask => 027,
+mode  => '0750',
+umask => '027',
 require   => File[$::geowiki::params::private_data_bare_path],
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ica9a6038b8a84293cda8dfadf2f3bf2f05a06a23
Gerrit-PatchSet: 15
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Juniorsys 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Ottomata

[MediaWiki-commits] [Gerrit] operations/puppet[production]: geowiki module: Lint changes + modes/umask quoting

2017-01-14 Thread Juniorsys (Code Review)

Juniorsys has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332101 )

Change subject: geowiki module: Lint changes + modes/umask quoting
..

geowiki module: Lint changes + modes/umask quoting

Use full names for class names, as relative names are not allowed in
future Puppet versions

Quote mode and umask values. Unquoted mode values in a File resource
type in later Puppet versions will generate an error, as will unquoted
umask values for Exec resource types.

Bug: T93645

Change-Id: Ica9a6038b8a84293cda8dfadf2f3bf2f05a06a23
---
M modules/geowiki/manifests/job.pp
M modules/geowiki/manifests/job/data.pp
M modules/geowiki/manifests/job/limn.pp
M modules/geowiki/manifests/job/monitoring.pp
M modules/geowiki/manifests/mysql_conf.pp
M modules/geowiki/manifests/private_data.pp
6 files changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/332101/1

diff --git a/modules/geowiki/manifests/job.pp b/modules/geowiki/manifests/job.pp
index 7a635cf..6d49d61 100644
--- a/modules/geowiki/manifests/job.pp
+++ b/modules/geowiki/manifests/job.pp
@@ -6,7 +6,7 @@
 
 include ::geowiki::params
 include ::geowiki::mysql_conf
-include geoip
+include ::geoip
 
 # This is not a complete list of
 # python packages that geowiki requires.
diff --git a/modules/geowiki/manifests/job/data.pp 
b/modules/geowiki/manifests/job/data.pp
index 3e7f73a..9ceba53 100644
--- a/modules/geowiki/manifests/job/data.pp
+++ b/modules/geowiki/manifests/job/data.pp
@@ -4,7 +4,7 @@
 # editor geocoding statistics, saved back into a db.
 #
 class geowiki::job::data inherits geowiki::job {
-include passwords::mysql::globaldev
+include ::passwords::mysql::globaldev
 
 # install MySQL conf files for db acccess
 $globaldev_mysql_user = $passwords::mysql::globaldev::user
diff --git a/modules/geowiki/manifests/job/limn.pp 
b/modules/geowiki/manifests/job/limn.pp
index 656e0f9..fb8468b 100644
--- a/modules/geowiki/manifests/job/limn.pp
+++ b/modules/geowiki/manifests/job/limn.pp
@@ -2,7 +2,7 @@
 # Installs a cron job to create limn files from the geocoded editor data.
 #
 class geowiki::job::limn inherits geowiki::job {
-require geowiki::private_data
+require ::geowiki::private_data
 
 git::clone { 'geowiki-data-public':
 ensure=> 'latest',
diff --git a/modules/geowiki/manifests/job/monitoring.pp 
b/modules/geowiki/manifests/job/monitoring.pp
index cd260b6..4c6b1ab 100644
--- a/modules/geowiki/manifests/job/monitoring.pp
+++ b/modules/geowiki/manifests/job/monitoring.pp
@@ -5,7 +5,7 @@
 # Disabled for now due to restructuring of geowiki.
 #
 class geowiki::job::monitoring inherits geowiki::job {
-include passwords::geowiki
+include ::passwords::geowiki
 
 $geowiki_http_user= $passwords::geowiki::user
 $geowiki_http_pass= $passwords::geowiki::pass
diff --git a/modules/geowiki/manifests/mysql_conf.pp 
b/modules/geowiki/manifests/mysql_conf.pp
index 256ba51..b3fa2f6 100644
--- a/modules/geowiki/manifests/mysql_conf.pp
+++ b/modules/geowiki/manifests/mysql_conf.pp
@@ -4,7 +4,7 @@
 #
 class geowiki::mysql_conf {
 include ::geowiki::params
-include passwords::mysql::research
+include ::passwords::mysql::research
 
 $research_mysql_user = $passwords::mysql::research::user
 $research_mysql_pass = $passwords::mysql::research::pass
diff --git a/modules/geowiki/manifests/private_data.pp 
b/modules/geowiki/manifests/private_data.pp
index 25f30a1..84a9534 100644
--- a/modules/geowiki/manifests/private_data.pp
+++ b/modules/geowiki/manifests/private_data.pp
@@ -17,7 +17,7 @@
 # It only needs backup (as the repo is not living in gerrit)
 # Other hosts need to rsync it over
 if $::fqdn == $::geowiki::params::private_data_bare_host {
-include role::backup::host
+include ::role::backup::host
 backup::set { 'a-geowiki-data-private-bare': }
 }
 else {
@@ -37,8 +37,8 @@
 origin=> "file://${::geowiki::params::private_data_bare_path}",
 owner => $::geowiki::params::user,
 group => 'www-data',
-mode  => 0750,
-umask => 027,
+mode  => '0750',
+umask => '027',
 require   => File[$::geowiki::params::private_data_bare_path],
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica9a6038b8a84293cda8dfadf2f3bf2f05a06a23
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Juniorsys 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: geowiki module: Lint changes + modes/umask quoting

[MediaWiki-commits] [Gerrit] operations/puppet[production]: geowiki module: Lint changes + modes/umask quoting

2 matches

Site Navigation

Mail list logo

Footer information