Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/326461 )
Change subject: Deploy scholarships with scap3
......................................................................
Deploy scholarships with scap3
Bug: T129134
Change-Id: I24094dd9335b930f9933d8f58d53f5be3ae25e23
---
M hieradata/common/role/deployment.yaml
M hieradata/role/common/deployment/server.yaml
M modules/role/manifests/wikimania_scholarships.pp
M modules/wikimania_scholarships/manifests/init.pp
4 files changed, 12 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/61/326461/1
diff --git a/hieradata/common/role/deployment.yaml
b/hieradata/common/role/deployment.yaml
index 6cef155..473036e 100644
--- a/hieradata/common/role/deployment.yaml
+++ b/hieradata/common/role/deployment.yaml
@@ -35,8 +35,6 @@
elasticsearch/plugins:
gitfat_enabled: true
upstream:
https://gerrit.wikimedia.org/r/operations/software/elasticsearch/plugins
- scholarships/scholarships:
- upstream: https://gerrit.wikimedia.org/r/wikimedia/wikimania-scholarships
librenms/librenms:
upstream: https://gerrit.wikimedia.org/r/operations/software/librenms
iegreview/iegreview:
diff --git a/hieradata/role/common/deployment/server.yaml
b/hieradata/role/common/deployment/server.yaml
index e8163ee..bb8dcfa 100644
--- a/hieradata/role/common/deployment/server.yaml
+++ b/hieradata/role/common/deployment/server.yaml
@@ -114,6 +114,8 @@
repository: maps/tilerator/deploy
# lvs_service: tilerator
trending-edits/deploy: {}
+ wikimedia/wikimania-scholarships:
+ repository: scholarships/scholarships
wdqs/wdqs:
repository: wikidata/query/deploy
# lvs_service: wdqs
diff --git a/modules/role/manifests/wikimania_scholarships.pp
b/modules/role/manifests/wikimania_scholarships.pp
index 735a3c2..a6b0aa8 100644
--- a/modules/role/manifests/wikimania_scholarships.pp
+++ b/modules/role/manifests/wikimania_scholarships.pp
@@ -24,5 +24,10 @@
port => '80',
}
+ scap::target { 'wikimedia/wikimania-scholarships':
+ service_name => 'scholarships',
+ deploy_user => 'deploy-service'
+ }
+
}
# vim:sw=4 ts=4 sts=4 et:
diff --git a/modules/wikimania_scholarships/manifests/init.pp
b/modules/wikimania_scholarships/manifests/init.pp
index 49c94d7..fa069c7 100644
--- a/modules/wikimania_scholarships/manifests/init.pp
+++ b/modules/wikimania_scholarships/manifests/init.pp
@@ -47,6 +47,11 @@
provider => 'trebuchet',
}
+ scap::target { 'wikimedia/wikimania-scholarships':
+ service_name => 'scholarships',
+ deploy_user => 'deploy-service'
+ }
+
apache::site { 'scholarships.wikimedia.org':
content => template('wikimania_scholarships/apache.conf.erb'),
}
--
To view, visit https://gerrit.wikimedia.org/r/326461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I24094dd9335b930f9933d8f58d53f5be3ae25e23
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Niharika29 <nko...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
