Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/377205 )
Change subject: mathoid: move to role/profile
......................................................................
mathoid: move to role/profile
Change-Id: I5756122ac1f1363ee7239c43ecb403e8ba1e54c2
---
D modules/mathoid/manifests/init.pp
D modules/mathoid/manifests/packages.pp
D modules/mathoid/tests/Makefile
D modules/mathoid/tests/mathoid.pp
A modules/profile/manifests/mathoid.pp
M modules/role/manifests/mathoid.pp
6 files changed, 25 insertions(+), 49 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/377205/1
diff --git a/modules/mathoid/manifests/init.pp
b/modules/mathoid/manifests/init.pp
deleted file mode 100644
index 5f714b0..0000000
--- a/modules/mathoid/manifests/init.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# == Class: mathoid
-#
-# Mathoid is an application which takes various forms of math input and
-# converts it to MathML + SVG output. It is a web-service implemented
-# in node.js.
-#
-class mathoid {
-
- require ::mathoid::packages
-
- service::node { 'mathoid':
- port => 10042,
- healthcheck_url => '',
- has_spec => true,
- deployment => 'scap3',
- deployment_config => true,
- }
-}
diff --git a/modules/mathoid/manifests/packages.pp
b/modules/mathoid/manifests/packages.pp
deleted file mode 100644
index 529d3a3..0000000
--- a/modules/mathoid/manifests/packages.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# == Class: mathoid::packages
-#
-# Installs the packages needed by Mathoid
-#
-# NOTE: this is a temporary work-around for the CI to be able to install
-# development packages. In the future, we want to have more integration so as
to
-# run tests as close to production as possible.
-#
-class mathoid::packages {
-
- service::packages { 'mathoid':
- pkgs => ['librsvg2-2'],
- dev_pkgs => ['librsvg2-dev'],
- }
-
-}
diff --git a/modules/mathoid/tests/Makefile b/modules/mathoid/tests/Makefile
deleted file mode 100644
index 76cd656..0000000
--- a/modules/mathoid/tests/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-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/mathoid/tests/mathoid.pp b/modules/mathoid/tests/mathoid.pp
deleted file mode 100644
index 1f030cd..0000000
--- a/modules/mathoid/tests/mathoid.pp
+++ /dev/null
@@ -1 +0,0 @@
-class { 'mathoid': }
diff --git a/modules/profile/manifests/mathoid.pp
b/modules/profile/manifests/mathoid.pp
new file mode 100644
index 0000000..9d4601e
--- /dev/null
+++ b/modules/profile/manifests/mathoid.pp
@@ -0,0 +1,24 @@
+# == Class: mathoid
+#
+# Mathoid is an application which takes various forms of math input and
+# converts it to MathML + SVG output. It is a web-service implemented
+# in node.js.
+#
+class profile::mathoid {
+ # NOTE: this is a temporary work-around for the CI to be able to install
+ # development packages. In the future, we want to have more integration so
as to
+ # run tests as close to production as possible.
+ #
+ service::packages { 'mathoid':
+ pkgs => ['librsvg2-2'],
+ dev_pkgs => ['librsvg2-dev'],
+ }
+
+ service::node { 'mathoid':
+ port => 10042,
+ healthcheck_url => '',
+ has_spec => true,
+ deployment => 'scap3',
+ deployment_config => true,
+ }
+}
diff --git a/modules/role/manifests/mathoid.pp
b/modules/role/manifests/mathoid.pp
index b10f5c4..809acb8 100644
--- a/modules/role/manifests/mathoid.pp
+++ b/modules/role/manifests/mathoid.pp
@@ -6,5 +6,5 @@
description => 'mathoid server'
}
- include ::mathoid
+ include ::profile::mathoid
}
--
To view, visit https://gerrit.wikimedia.org/r/377205
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5756122ac1f1363ee7239c43ecb403e8ba1e54c2
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
