Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: graphite: move templates to role
......................................................................


graphite: move templates to role

Change-Id: Ib10f09897da41065a5f58510eb61e2d78032e954
---
M manifests/role/installserver.pp
M modules/role/manifests/graphite/base.pp
R modules/role/templates/graphite/apache-auth-ldap.erb
R modules/role/templates/graphite/apache-auth-local.erb
R modules/role/templates/graphite/graphite.apache.erb
5 files changed, 4 insertions(+), 7 deletions(-)

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git a/manifests/role/installserver.pp b/manifests/role/installserver.pp
index e10b69b..caddbe7 100644
--- a/manifests/role/installserver.pp
+++ b/manifests/role/installserver.pp
@@ -30,9 +30,9 @@
     include install_server::preseed_server
 
     if os_version('ubuntu >= trusty') or os_version('debian >= jessie') {
-        $config_content = template('caching-proxy/squid.conf.erb')
+        $config_content = template('role/caching-proxy/squid.conf.erb')
     } else {
-        $config_content = template('squid3/precise_acls_conf.erb', 
'caching-proxy/squid.conf.erb')
+        $config_content = template('squid3/precise_acls_conf.erb', 
'role/caching-proxy/squid.conf.erb')
     }
 
     class { 'squid3':
@@ -74,4 +74,3 @@
         check_command => 'check_http',
     }
 }
-
diff --git a/modules/role/manifests/graphite/base.pp 
b/modules/role/manifests/graphite/base.pp
index 0e2c34b..0b36189 100644
--- a/modules/role/manifests/graphite/base.pp
+++ b/modules/role/manifests/graphite/base.pp
@@ -222,11 +222,11 @@
             'cn=wmf,ou=groups,dc=wikimedia,dc=org'
         ]
         $auth_realm    = 'WMF Labs (use wiki login name not shell) - 
nda/ops/wmf'
-        $apache_auth   = template('graphite/apache-auth-ldap.erb')
+        $apache_auth   = template('role/graphite/apache-auth-ldap.erb')
     }
 
     apache::site { $hostname:
-        content => template('graphite/graphite.apache.erb'),
+        content => template('role/graphite/graphite.apache.erb'),
     }
 
     if $::initsystem == 'upstart' {
@@ -261,5 +261,3 @@
         check_command => "check_http_url!${hostname}!/render",
     }
 }
-
-
diff --git a/templates/graphite/apache-auth-ldap.erb 
b/modules/role/templates/graphite/apache-auth-ldap.erb
similarity index 100%
rename from templates/graphite/apache-auth-ldap.erb
rename to modules/role/templates/graphite/apache-auth-ldap.erb
diff --git a/templates/graphite/apache-auth-local.erb 
b/modules/role/templates/graphite/apache-auth-local.erb
similarity index 100%
rename from templates/graphite/apache-auth-local.erb
rename to modules/role/templates/graphite/apache-auth-local.erb
diff --git a/templates/graphite/graphite.apache.erb 
b/modules/role/templates/graphite/graphite.apache.erb
similarity index 100%
rename from templates/graphite/graphite.apache.erb
rename to modules/role/templates/graphite/graphite.apache.erb

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib10f09897da41065a5f58510eb61e2d78032e954
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to