Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/377204 )
Change subject: mobileapps: move to role/profile
......................................................................
mobileapps: move to role/profile
Change-Id: I579fd89846f54aab6762e709edcc076f4efec948
---
D modules/mobileapps/tests/Makefile
D modules/mobileapps/tests/init.pp
R modules/profile/manifests/mobileapps.pp
M modules/role/manifests/mobileapps.pp
4 files changed, 3 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/04/377204/1
diff --git a/modules/mobileapps/tests/Makefile
b/modules/mobileapps/tests/Makefile
deleted file mode 100644
index 3551657..0000000
--- a/modules/mobileapps/tests/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# Test automator
-MANIFESTS=$(wildcard *.pp)
-OBJS=$(MANIFESTS:.pp=.po)
-TESTS_DIR=$(dir $(CURDIR))
-MODULE_DIR=$(TESTS_DIR:/=)
-MODULES_DIR=$(dir $(MODULE_DIR))
-
-all: test
-
-test: $(OBJS)
-
-%.po: %.pp
- puppet parser validate $<
- puppet apply --noop --modulepath $(MODULES_DIR) $<
diff --git a/modules/mobileapps/tests/init.pp b/modules/mobileapps/tests/init.pp
deleted file mode 100644
index 0733291..0000000
--- a/modules/mobileapps/tests/init.pp
+++ /dev/null
@@ -1 +0,0 @@
-include ::mobileapps
diff --git a/modules/mobileapps/manifests/init.pp
b/modules/profile/manifests/mobileapps.pp
similarity index 89%
rename from modules/mobileapps/manifests/init.pp
rename to modules/profile/manifests/mobileapps.pp
index 13db326..edc703e 100644
--- a/modules/mobileapps/manifests/init.pp
+++ b/modules/profile/manifests/mobileapps.pp
@@ -1,4 +1,4 @@
-# Class: mobileapps
+# Class: profile::mobileapps
#
# This class installs and configures mobileapps
#
@@ -7,7 +7,7 @@
# classes as well as conform to a de-facto standard of having a module for
every
# service
#
-class mobileapps() {
+class profile::mobileapps {
service::node { 'mobileapps':
port => 8888,
has_spec => true,
diff --git a/modules/role/manifests/mobileapps.pp
b/modules/role/manifests/mobileapps.pp
index d1de20f..e553686 100644
--- a/modules/role/manifests/mobileapps.pp
+++ b/modules/role/manifests/mobileapps.pp
@@ -5,5 +5,5 @@
description => 'A service for use by mobile apps. Provides DOM
manipulation, aggregation, JSON flattening'
}
- include ::mobileapps
+ include ::profile::mobileapps
}
--
To view, visit https://gerrit.wikimedia.org/r/377204
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I579fd89846f54aab6762e709edcc076f4efec948
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
