Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378241 )
Change subject: Deploy ocg with scap3
......................................................................
Deploy ocg with scap3
Bug: T129142
Change-Id: I633dd2aad74ee4bbd488e76c201b6540bb5dc2d3
Depends-On: I6ca4630767a1b961215533130b16bf965acc415e
---
M hieradata/common/role/deployment.yaml
M hieradata/common/scap/dsh.yaml
M hieradata/role/common/deployment_server.yaml
M modules/ocg/manifests/init.pp
4 files changed, 9 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/41/378241/1
diff --git a/hieradata/common/role/deployment.yaml
b/hieradata/common/role/deployment.yaml
index dfd570f..5515544 100644
--- a/hieradata/common/role/deployment.yaml
+++ b/hieradata/common/role/deployment.yaml
@@ -2,10 +2,6 @@
eventlogging/eventlogging:
upstream: https://gerrit.wikimedia.org/r/eventlogging
checkout_submodules: true
- ocg/ocg:
- upstream: https://gerrit.wikimedia.org/r/mediawiki/services/ocg-collection
- service_name: ocg
- checkout_submodules: true
fluoride/fluoride:
upstream: https://gerrit.wikimedia.org/r/mediawiki/tools/fluoride
elasticsearch/plugins:
diff --git a/hieradata/common/scap/dsh.yaml b/hieradata/common/scap/dsh.yaml
index c12c347..4f4d307 100644
--- a/hieradata/common/scap/dsh.yaml
+++ b/hieradata/common/scap/dsh.yaml
@@ -89,6 +89,11 @@
- logstash1001.eqiad.wmnet
- logstash1002.eqiad.wmnet
- logstash1003.eqiad.wmnet
+ ocg:
+ hosts:
+ - ocg1001.eqiad.wmnet
+ - ocg1002.eqiad.wmnet
+ - ocg1003.eqiad.wmnet
relforge:
hosts:
- relforge1001.eqiad.wmnet
diff --git a/hieradata/role/common/deployment_server.yaml
b/hieradata/role/common/deployment_server.yaml
index b8bbe93..a6365f3 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -126,6 +126,8 @@
# lvs_service: mathoid
mobileapps/deploy: {}
# lvs_service: mobileapps
+ ocg/ocg:
+ repository: mediawiki/services/ocg-collection
ores/deploy: {}
# lvs_service: ores
parsoid/deploy: {}
diff --git a/modules/ocg/manifests/init.pp b/modules/ocg/manifests/init.pp
index 06bac51..d4ea326 100644
--- a/modules/ocg/manifests/init.pp
+++ b/modules/ocg/manifests/init.pp
@@ -26,8 +26,8 @@
$postmortem_dir = '/srv/deployment/ocg/postmortem',
$log_dir = '/srv/deployment/ocg/log'
) {
- package { 'ocg/ocg':
- provider => 'trebuchet',
+ scap::target { 'ocg/ocg':
+ deploy_user => 'deploy-service',
}
group { 'ocg':
--
To view, visit https://gerrit.wikimedia.org/r/378241
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I633dd2aad74ee4bbd488e76c201b6540bb5dc2d3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani <tcipri...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
