[MediaWiki-commits] [Gerrit] shinken: Cleanup to be better compatible with autoload layout - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: shinken: Cleanup to be better compatible with autoload layout
......................................................................

shinken: Cleanup to be better compatible with autoload layout

Change-Id: If8d4d1af1f11b8e1cd39c1cee738f709d5bfdae4
---
M manifests/role/labsshinken.pp
M modules/shinken/manifests/init.pp
M modules/shinken/manifests/services.pp
M modules/shinken/manifests/shinkengen.pp
4 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/17/175717/1

diff --git a/manifests/role/labsshinken.pp b/manifests/role/labsshinken.pp
index 7084916..db88ed2 100644
--- a/manifests/role/labsshinken.pp
+++ b/manifests/role/labsshinken.pp
@@ -2,7 +2,7 @@
 # Sets up a shinken server for labs
 
 class role::labs::shinken {
-    class { 'shinken::server':
+    class { 'shinken':
         auth_secret => 'This is insecure, should switch to using private repo',
     }
 
diff --git a/modules/shinken/manifests/init.pp 
b/modules/shinken/manifests/init.pp
index c9fb2f2..c2f70da 100644
--- a/modules/shinken/manifests/init.pp
+++ b/modules/shinken/manifests/init.pp
@@ -1,7 +1,7 @@
-# = Class: shinken::server
+# = Class: shinken
 # Sets up a shinken monitoring server
 
-class shinken::server(
+class shinken(
     $auth_secret
 ) {
     include shinken::shinkengen
diff --git a/modules/shinken/manifests/services.pp 
b/modules/shinken/manifests/services.pp
index 951fa6c..958d850 100644
--- a/modules/shinken/manifests/services.pp
+++ b/modules/shinken/manifests/services.pp
@@ -4,7 +4,7 @@
     $ensure  = present,
     $source  = undef,
 ) {
-    include shinken::server
+    include shinken
 
     file { "/etc/shinken/services/$title.cfg":
         ensure  => $ensure,
diff --git a/modules/shinken/manifests/shinkengen.pp 
b/modules/shinken/manifests/shinkengen.pp
index e694dac..4531e43 100644
--- a/modules/shinken/manifests/shinkengen.pp
+++ b/modules/shinken/manifests/shinkengen.pp
@@ -7,7 +7,7 @@
 # files have changed
 class shinken::shinkengen {
 
-    include shinken::server
+    include shinken
 
     package { 'python3-shinkengen':
         ensure => latest,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If8d4d1af1f11b8e1cd39c1cee738f709d5bfdae4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>

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