Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/382336 )
Change subject: racktables: role/profile, remove style violations
......................................................................
racktables: role/profile, remove style violations
Change-Id: I9278b84268feef8565d9a074cbdb8a664c5f4eaa
---
R hieradata/role/common/racktables.yaml
M manifests/site.pp
R modules/profile/manifests/racktables.pp
M modules/racktables/manifests/init.pp
A modules/role/manifests/racktables.pp
5 files changed, 23 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/36/382336/1
diff --git a/hieradata/role/common/racktables/server.yaml
b/hieradata/role/common/racktables.yaml
similarity index 100%
rename from hieradata/role/common/racktables/server.yaml
rename to hieradata/role/common/racktables.yaml
diff --git a/manifests/site.pp b/manifests/site.pp
index 2d13568..ef42880 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1244,7 +1244,7 @@
# Running this here because krypton is a 'misc' Jessie
# <s>monitoring host</s> (not really, it's just misc apps)
role(wikimania_scholarships, iegreview::app, grafana::production,
- kafka::analytics::burrow, racktables::server)
+ kafka::analytics::burrow, racktables)
include ::standard
}
diff --git a/modules/role/manifests/racktables/server.pp
b/modules/profile/manifests/racktables.pp
similarity index 73%
rename from modules/role/manifests/racktables/server.pp
rename to modules/profile/manifests/racktables.pp
index 4d0c82f..0eaa989 100644
--- a/modules/role/manifests/racktables/server.pp
+++ b/modules/profile/manifests/racktables.pp
@@ -1,17 +1,20 @@
-# https://racktables.wikimedia.org
-
## Please note that Racktables is a tarball extraction based installation
## into its web directory root. This means that puppet cannot fully automate
## the installation at this time & the actual tarball must be downloaded from
## http://racktables.org/ and unzipped into /srv/org/wikimedia/racktables
#
# filtertags: labs-project-servermon
-class role::racktables::server {
-
- system::role { 'racktables::server': description => 'Racktables server' }
+class profile::racktables {
include ::standard
include ::base::firewall
+ include ::mysql
+ include ::passwords::racktables
+ include ::apache
+ include ::apache::mod::php5
+ include ::apache::mod::ssl
+ include ::apache::mod::rewrite
+ include ::apache::mod::headers
ferm::service { 'racktables-http':
proto => 'tcp',
diff --git a/modules/racktables/manifests/init.pp
b/modules/racktables/manifests/init.pp
index 3d9438a..3b13580 100644
--- a/modules/racktables/manifests/init.pp
+++ b/modules/racktables/manifests/init.pp
@@ -6,11 +6,6 @@
class racktables ($racktables_host, $racktables_db_host, $racktables_db) {
include ::mysql
include ::passwords::racktables
- include ::apache
- include ::apache::mod::php5
- include ::apache::mod::ssl
- include ::apache::mod::rewrite
- include ::apache::mod::headers
require_package('php5-mysql', 'php5-gd')
diff --git a/modules/role/manifests/racktables.pp
b/modules/role/manifests/racktables.pp
new file mode 100644
index 0000000..b0b7bbb
--- /dev/null
+++ b/modules/role/manifests/racktables.pp
@@ -0,0 +1,14 @@
+# https://racktables.wikimedia.org
+
+## Please note that Racktables is a tarball extraction based installation
+## into its web directory root. This means that puppet cannot fully automate
+## the installation at this time & the actual tarball must be downloaded from
+## http://racktables.org/ and unzipped into /srv/org/wikimedia/racktables
+#
+# filtertags: labs-project-servermon
+class role::racktables {
+
+ system::role { 'racktables': description => 'Racktables server' }
+
+ include ::profile::racktables
+}
--
To view, visit https://gerrit.wikimedia.org/r/382336
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9278b84268feef8565d9a074cbdb8a664c5f4eaa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
