Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/327723 )
Change subject: MobileApps: Switch to Scap3 config deploys
......................................................................
MobileApps: Switch to Scap3 config deploys
Bug: T144598
Change-Id: Ia6575b86b962c89ef288c472e5e7e25a375be1b4
---
M modules/mobileapps/manifests/init.pp
D modules/mobileapps/templates/config.yaml.erb
2 files changed, 6 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/327723/1
diff --git a/modules/mobileapps/manifests/init.pp
b/modules/mobileapps/manifests/init.pp
index a3de4a9..13db326 100644
--- a/modules/mobileapps/manifests/init.pp
+++ b/modules/mobileapps/manifests/init.pp
@@ -7,21 +7,12 @@
# classes as well as conform to a de-facto standard of having a module for
every
# service
#
-# === Parameters
-#
-# [*user_agent*]
-# The user agent header to send to other services. Default: WMF Mobile
Content
-# Service
-#
-class mobileapps(
- $user_agent = 'WMF Mobile Content Service',
-) {
+class mobileapps() {
service::node { 'mobileapps':
- port => 8888,
- config => template('mobileapps/config.yaml.erb'),
- heap_limit => 450,
- has_spec => true,
- healthcheck_url => '',
- deployment => 'scap3',
+ port => 8888,
+ has_spec => true,
+ healthcheck_url => '',
+ deployment => 'scap3',
+ deployment_config => true,
}
}
diff --git a/modules/mobileapps/templates/config.yaml.erb
b/modules/mobileapps/templates/config.yaml.erb
deleted file mode 100644
index 34e677c..0000000
--- a/modules/mobileapps/templates/config.yaml.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-# do not use a proxy, since the service issues internal
-# requests only
-proxy:
-# the User-Agent header to send
-user_agent: <%= @user_agent %>
--
To view, visit https://gerrit.wikimedia.org/r/327723
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6575b86b962c89ef288c472e5e7e25a375be1b4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
