Andrew Bogott has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/242166

Change subject: Revert "Rsync:  Unquote booleans"
......................................................................

Revert "Rsync:  Unquote booleans"

I got carried away and unquoted 'no' and 'yes' as well, which turns out to be 
harmless but not really appropriate.

This reverts commit 49f949e85dfe6bc330810f07552e9c81619dc24a.

Change-Id: I87b04f8d0f2212b0b76ac6549b1bff6ffc1a8b23
---
M manifests/misc/udp2log.pp
M manifests/role/analytics.pp
M manifests/role/analytics/kafka.pp
M manifests/role/ci.pp
M manifests/role/eventlogging.pp
M manifests/role/labsnfs.pp
M manifests/role/lists.pp
M modules/archiva/manifests/gitfat.pp
M modules/dataset/manifests/rsync/default.pp
M modules/openstack/manifests/nova/compute.pp
M modules/rsync/manifests/server/module.pp
M modules/rsync/spec/defines/server_module_spec.rb
M modules/scap/manifests/master.pp
M modules/scap/manifests/proxy.pp
M modules/statistics/manifests/rsyncd.pp
M modules/swift/manifests/storage.pp
16 files changed, 37 insertions(+), 37 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/66/242166/1

diff --git a/manifests/misc/udp2log.pp b/manifests/misc/udp2log.pp
index c0b1bd8..0917e7e 100644
--- a/manifests/misc/udp2log.pp
+++ b/manifests/misc/udp2log.pp
@@ -84,7 +84,7 @@
     rsync::server::module { 'udp2log':
         comment     => 'udp2log log files',
         path        => $path,
-        read_only   => yes,
+        read_only   => 'yes',
         hosts_allow => $hosts_allow;
     }
 
diff --git a/manifests/role/analytics.pp b/manifests/role/analytics.pp
index 2e0708a..b6270bd 100644
--- a/manifests/role/analytics.pp
+++ b/manifests/role/analytics.pp
@@ -99,8 +99,8 @@
     # be present and mounted at /mnt/hdfs
     rsync::server::module { 'hdfs-archive':
         path        => "${::cdh::hadoop::mount::mount_point}/wmf/data/archive",
-        read_only   => yes,
-        list        => yes,
+        read_only   => 'yes',
+        list        => 'yes',
         hosts_allow => $hosts_allow,
         require     => Class['cdh::hadoop::mount'],
     }
diff --git a/manifests/role/analytics/kafka.pp 
b/manifests/role/analytics/kafka.pp
index f5ac848..fa7bcd1 100644
--- a/manifests/role/analytics/kafka.pp
+++ b/manifests/role/analytics/kafka.pp
@@ -216,7 +216,7 @@
             description  => 'Kafka Broker Server',
             nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 1:1 -C 
java -a "kafka.Kafka /etc/kafka/server.properties"',
             require      => Class['::kafka::server'],
-            critical     => true,
+            critical     => 'true',
         }
 
         # Generate icinga alert if this jmxtrans instance is not running.
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 8be5f30..6a8b6f1 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -470,7 +470,7 @@
 
     rsync::server::module { 'doc':
         path      => '/srv/doc',
-        read_only => no,
+        read_only => 'no',
         require   => [
             File['/srv/doc'],
             Class['role::labs::lvm::srv'],
diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index 8140a95..ed25784 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -250,8 +250,8 @@
 
         rsync::server::module { 'eventlogging':
             path        => $log_dir,
-            read_only   => yes,
-            list        => yes,
+            read_only   => 'yes',
+            list        => 'yes',
             require     => File[$log_dir],
             hosts_allow => $backup_destinations,
         }
diff --git a/manifests/role/labsnfs.pp b/manifests/role/labsnfs.pp
index 2a02f92..76d3a3b 100644
--- a/manifests/role/labsnfs.pp
+++ b/manifests/role/labsnfs.pp
@@ -19,7 +19,7 @@
 
     rsync::server::module { 'pagecounts':
         path        => '/srv/dumps/pagecounts',
-        read_only   => no,
+        read_only   => 'no',
         hosts_allow => $dump_servers_ips,
     }
 
@@ -30,7 +30,7 @@
     $statistics_servers = hiera('statistics_servers')
     rsync::server::module { 'statistics':
         path        => '/srv/statistics',
-        read_only   => no,
+        read_only   => 'no',
         hosts_allow => $statistics_servers,
         require     => File['/srv/statistics']
     }
diff --git a/manifests/role/lists.pp b/manifests/role/lists.pp
index 7da5c7c..c2a728e 100644
--- a/manifests/role/lists.pp
+++ b/manifests/role/lists.pp
@@ -181,31 +181,31 @@
 
     rsync::server::module { 'lists':
         path        => '/var/lib/mailman/lists',
-        read_only   => no,
+        read_only   => 'no',
         hosts_allow => '208.80.154.61',
     }
 
     rsync::server::module { 'archives':
         path        => '/var/lib/mailman/archives',
-        read_only   => no,
+        read_only   => 'no',
         hosts_allow => '208.80.154.61',
     }
 
     rsync::server::module { 'data':
         path        => '/var/lib/mailman/data',
-        read_only   => no,
+        read_only   => 'no',
         hosts_allow => '208.80.154.61',
     }
 
     rsync::server::module { 'qfiles':
         path        => '/var/lib/mailman/qfiles',
-        read_only   => no,
+        read_only   => 'no',
         hosts_allow => '208.80.154.61',
     }
 
     rsync::server::module { 'exim':
         path        => '/var/spool/exim4',
-        read_only   => no,
+        read_only   => 'no',
         hosts_allow => '208.80.154.61',
     }
 
diff --git a/modules/archiva/manifests/gitfat.pp 
b/modules/archiva/manifests/gitfat.pp
index c6591b5..ec18e64 100644
--- a/modules/archiva/manifests/gitfat.pp
+++ b/modules/archiva/manifests/gitfat.pp
@@ -56,8 +56,8 @@
     #   hostname::archiva/git-fat
     rsync::server::module { 'archiva':
         path      => $archiva_path,
-        read_only => yes,
+        read_only => 'yes',
         uid       => 'nobody',
         gid       => 'nogroup',
     }
-}
+}
\ No newline at end of file
diff --git a/modules/dataset/manifests/rsync/default.pp 
b/modules/dataset/manifests/rsync/default.pp
index f0d21cc..5c8d7d1 100644
--- a/modules/dataset/manifests/rsync/default.pp
+++ b/modules/dataset/manifests/rsync/default.pp
@@ -1,5 +1,5 @@
 class dataset::rsync::default(
-    $rsync_enable      = true,
+    $rsync_enable      = 'true', # this is a string used in a template
     $public            = true,
     $rsync_opts        = '--bwlimit=50000',
     $rsync_config_file = undef
diff --git a/modules/openstack/manifests/nova/compute.pp 
b/modules/openstack/manifests/nova/compute.pp
index 2f88f43..3729f48 100644
--- a/modules/openstack/manifests/nova/compute.pp
+++ b/modules/openstack/manifests/nova/compute.pp
@@ -68,7 +68,7 @@
 
         rsync::server::module { "nova_instance_rsync_controller":
             path        => '/var/lib/nova/instances',
-            read_only   => no,
+            read_only   => 'no',
             hosts_allow => [hiera('labs_nova_controller')],
         }
 
@@ -194,7 +194,7 @@
 
     rsync::server::module { "nova_instance_rsync_${hostname}":
         path        => '/var/lib/nova/instances',
-        read_only   => false,
+        read_only   => 'false',
         hosts_allow => ["${hostname}.${::site}.wmnet"],
     }
 }
diff --git a/modules/rsync/manifests/server/module.pp 
b/modules/rsync/manifests/server/module.pp
index 47e43c6..241a551 100644
--- a/modules/rsync/manifests/server/module.pp
+++ b/modules/rsync/manifests/server/module.pp
@@ -35,9 +35,9 @@
 define rsync::server::module (
   $path,
   $comment         = undef,
-  $read_only       = yes,
-  $write_only      = no,
-  $list            = yes,
+  $read_only       = 'yes',
+  $write_only      = 'no',
+  $list            = 'yes',
   $uid             = '0',
   $gid             = '0',
   $incoming_chmod  = '0644',
diff --git a/modules/rsync/spec/defines/server_module_spec.rb 
b/modules/rsync/spec/defines/server_module_spec.rb
index afd3e5c..736420f 100644
--- a/modules/rsync/spec/defines/server_module_spec.rb
+++ b/modules/rsync/spec/defines/server_module_spec.rb
@@ -47,9 +47,9 @@
 
   {
     :comment        => 'super module !',
-    :read_only      => no,
-    :write_only     => yes,
-    :list           => no,
+    :read_only      => 'no',
+    :write_only     => 'yes',
+    :list           => 'no',
     :uid            => '4682',
     :gid            => '4682',
     :secrets_file   => '/path/to/secrets',
diff --git a/modules/scap/manifests/master.pp b/modules/scap/manifests/master.pp
index 2ef3b8e..b02285f 100644
--- a/modules/scap/manifests/master.pp
+++ b/modules/scap/manifests/master.pp
@@ -25,7 +25,7 @@
 
     rsync::server::module { 'common':
         path        => $common_source_path,
-        read_only   => yes,
+        read_only   => 'yes',
         hosts_allow => $::network::constants::mw_appserver_networks;
     }
 
diff --git a/modules/scap/manifests/proxy.pp b/modules/scap/manifests/proxy.pp
index 2ac32da..794ce7d 100644
--- a/modules/scap/manifests/proxy.pp
+++ b/modules/scap/manifests/proxy.pp
@@ -7,7 +7,7 @@
 
     rsync::server::module { 'common':
         path        => '/srv/mediawiki',
-        read_only   => true,
+        read_only   => 'true',
         hosts_allow => $::network::constants::mw_appserver_networks;
     }
 }
diff --git a/modules/statistics/manifests/rsyncd.pp 
b/modules/statistics/manifests/rsyncd.pp
index ff5aee3..acb99ff 100644
--- a/modules/statistics/manifests/rsyncd.pp
+++ b/modules/statistics/manifests/rsyncd.pp
@@ -19,8 +19,8 @@
     # (in /etc/rsyncd.conf) for /srv.
     rsync::server::module { 'srv':
         path        => $path,
-        read_only   => no,
-        list        => yes,
+        read_only   => 'no',
+        list        => 'yes',
         hosts_allow => $hosts_allow,
     }
 
@@ -30,8 +30,8 @@
     if ($::statistics::working_path == '/srv') {
         rsync::server::module { 'a':
             path        => $path,
-            read_only   => no,
-            list        => yes,
+            read_only   => 'no',
+            list        => 'yes',
             hosts_allow => $hosts_allow,
         }
     }
@@ -42,8 +42,8 @@
     # from the default Apache VirtualHost.
     rsync::server::module { 'www':
         path        => '/var/www',
-        read_only   => no,
-        list        => yes,
+        read_only   => 'no',
+        list        => 'yes',
         hosts_allow => $hosts_allow,
     }
 
@@ -54,4 +54,4 @@
         port   => '873',
         srange => '($INTERNAL)',
     }
-}
+}
\ No newline at end of file
diff --git a/modules/swift/manifests/storage.pp 
b/modules/swift/manifests/storage.pp
index f4bb195..42758f7 100644
--- a/modules/swift/manifests/storage.pp
+++ b/modules/swift/manifests/storage.pp
@@ -20,7 +20,7 @@
         gid             => 'swift',
         max_connections => '5',
         path            => '/srv/swift-storage/',
-        read_only       => no,
+        read_only       => 'no',
         lock_file       => '/var/lock/account.lock',
     }
     rsync::server::module { 'container':
@@ -28,7 +28,7 @@
         gid             => 'swift',
         max_connections => '5',
         path            => '/srv/swift-storage/',
-        read_only       => no,
+        read_only       => 'no',
         lock_file       => '/var/lock/container.lock',
     }
     rsync::server::module { 'object':
@@ -36,7 +36,7 @@
         gid             => 'swift',
         max_connections => '13',
         path            => '/srv/swift-storage/',
-        read_only       => no,
+        read_only       => 'no',
         lock_file       => '/var/lock/object.lock',
     }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I87b04f8d0f2212b0b76ac6549b1bff6ffc1a8b23
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>

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

Reply via email to