Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/306981
Change subject: Added filtertags to labs role descriptions.
......................................................................
Added filtertags to labs role descriptions.
This is an experiment to spruce up role filtering
for the new labs puppet GUI
Bug: T91990
Change-Id: Ic25662a110068969240083f6f4f9986628388898
---
M manifests/role/aptly.pp
M manifests/role/puppet.pp
M manifests/role/simplelamp.pp
M modules/role/manifests/labs/lvm/mnt.pp
M modules/role/manifests/labs/lvm/srv.pp
M modules/role/manifests/labs/mediawiki_vagrant.pp
6 files changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/81/306981/1
diff --git a/manifests/role/aptly.pp b/manifests/role/aptly.pp
index 3fead6c..67017fa 100644
--- a/manifests/role/aptly.pp
+++ b/manifests/role/aptly.pp
@@ -1,6 +1,8 @@
# = Class: role::aptly
#
# Sets up a simple aptly repo server serving over http on port 80
+#
+# filtertags: labs-shortlist
class role::aptly {
include ::aptly
diff --git a/manifests/role/puppet.pp b/manifests/role/puppet.pp
index 6a4be1d..299b609 100644
--- a/manifests/role/puppet.pp
+++ b/manifests/role/puppet.pp
@@ -10,6 +10,7 @@
# This allows puppet classes to be configured via LDAP
# and wikitech instance configuration.
#
+# filtertags: labs-shortlist
class role::puppet::self(
$master = $::puppetmaster,
$autoupdate_master = true,
diff --git a/manifests/role/simplelamp.pp b/manifests/role/simplelamp.pp
index 41cd27e..7a75bb8 100644
--- a/manifests/role/simplelamp.pp
+++ b/manifests/role/simplelamp.pp
@@ -1,6 +1,8 @@
# = class: role::simplelamp
#
# Sets up a simple LAMP server for use by arbitrary php applications
+#
+# filtertags: labs-shortlist
class role::simplelamp(
$mysql_local = true,
$mysql_datadir = '/srv/mysql',
diff --git a/modules/role/manifests/labs/lvm/mnt.pp
b/modules/role/manifests/labs/lvm/mnt.pp
index acd827d..7acabe4 100644
--- a/modules/role/manifests/labs/lvm/mnt.pp
+++ b/modules/role/manifests/labs/lvm/mnt.pp
@@ -1,6 +1,8 @@
# Allocate all of the instance's extra space as /mnt or the user specified
# mount point given in the $::lvm_mount_point global variable.
# FIXME: Deprecate and kill with mild fire
+#
+# filtertags: labs-project-labtestproject
class role::labs::lvm::mnt {
$mount_point = $::lvm_mount_point ? {
undef => '/mnt',
diff --git a/modules/role/manifests/labs/lvm/srv.pp
b/modules/role/manifests/labs/lvm/srv.pp
index 9faf1e5..d6d14a3 100644
--- a/modules/role/manifests/labs/lvm/srv.pp
+++ b/modules/role/manifests/labs/lvm/srv.pp
@@ -1,4 +1,6 @@
# Allocate all of the instance's extra space as /srv
+#
+# filtertags: labs-shortlist
class role::labs::lvm::srv {
labs_lvm::volume { 'second-local-disk':
mountat => '/srv',
diff --git a/modules/role/manifests/labs/mediawiki_vagrant.pp
b/modules/role/manifests/labs/mediawiki_vagrant.pp
index a426e4a..ba4e6a7 100644
--- a/modules/role/manifests/labs/mediawiki_vagrant.pp
+++ b/modules/role/manifests/labs/mediawiki_vagrant.pp
@@ -4,6 +4,8 @@
# provision a MediaWiki-Vagrant clone for shared use.
#
# Conflicts with role::labs_vagrant.
+#
+# filtertags: labs-shortlist
class role::labs::mediawiki_vagrant {
include ::vagrant
include ::vagrant::lxc
--
To view, visit https://gerrit.wikimedia.org/r/306981
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic25662a110068969240083f6f4f9986628388898
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
