Alexandros Kosiaris has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354186 )
Change subject: Scap3: deploy jobrunner with scap3 ...................................................................... Scap3: deploy jobrunner with scap3 Bug: T129148 Change-Id: I9b60db40222172da63f4e29cc64bbbf49567a960 --- M hieradata/common/role/deployment.yaml M hieradata/common/scap/dsh.yaml M hieradata/labs/deployment-prep/common.yaml M hieradata/role/common/deployment_server.yaml M modules/mediawiki/manifests/jobrunner.pp 5 files changed, 17 insertions(+), 7 deletions(-) Approvals: Thcipriani: Looks good to me, but someone else must approve Hashar: Looks good to me, but someone else must approve Alexandros Kosiaris: Verified; Looks good to me, approved diff --git a/hieradata/common/role/deployment.yaml b/hieradata/common/role/deployment.yaml index 7612021..98fd56d 100644 --- a/hieradata/common/role/deployment.yaml +++ b/hieradata/common/role/deployment.yaml @@ -1,7 +1,4 @@ role::deployment::repo_config: - jobrunner/jobrunner: - upstream: https://gerrit.wikimedia.org/r/mediawiki/services/jobrunner - service_name: jobrunner eventlogging/eventlogging: upstream: https://gerrit.wikimedia.org/r/eventlogging checkout_submodules: true diff --git a/hieradata/common/scap/dsh.yaml b/hieradata/common/scap/dsh.yaml index fa78973..17d5421 100644 --- a/hieradata/common/scap/dsh.yaml +++ b/hieradata/common/scap/dsh.yaml @@ -17,6 +17,14 @@ scap::dsh::groups: + jobrunner-canaries: + hosts: + - mw1299.eqiad.wmnet + - mw2247.codfw.wmnet + jobrunner: + conftool: + - {'cluster': 'videoscaler', 'service': 'apache2'} + - {'cluster': 'jobrunner', 'service': 'apache2'} mediawiki-installation: conftool: - {'cluster': 'appserver', 'service': 'apache2'} diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 985bb42..eb6e2c1 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -302,6 +302,9 @@ eventstreams/deploy: repository: mediawiki/services/eventstreams/deploy + jobrunner/jobrunner: + repository: mediawiki/services/jobrunner + # RESTBase restbase/deploy: {} diff --git a/hieradata/role/common/deployment_server.yaml b/hieradata/role/common/deployment_server.yaml index 729a5e3..c54df9e 100644 --- a/hieradata/role/common/deployment_server.yaml +++ b/hieradata/role/common/deployment_server.yaml @@ -102,6 +102,8 @@ repository: mediawiki/services/eventstreams/deploy graphoid/deploy: {} # lvs_service: graphoid + jobrunner/jobrunner: + repository: mediawiki/services/jobrunner kartotherian/deploy: repository: maps/kartotherian/deploy # lvs_service: kartotherian diff --git a/modules/mediawiki/manifests/jobrunner.pp b/modules/mediawiki/manifests/jobrunner.pp index 46be7a5..9b2bf65 100644 --- a/modules/mediawiki/manifests/jobrunner.pp +++ b/modules/mediawiki/manifests/jobrunner.pp @@ -20,10 +20,10 @@ include ::passwords::redis - package { 'jobrunner': - ensure => latest, - provider => 'trebuchet', - notify => Service['jobrunner'], + scap::target { 'jobrunner/jobrunner': + deploy_user => 'mwdeploy', + manage_user => false, + service_name => 'jobrunner', } $dispatcher = template('mediawiki/jobrunner/dispatcher.erb') -- To view, visit https://gerrit.wikimedia.org/r/354186 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9b60db40222172da63f4e29cc64bbbf49567a960 Gerrit-PatchSet: 7 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Thcipriani <[email protected]> Gerrit-Reviewer: Alex Monk <[email protected]> Gerrit-Reviewer: Alexandros Kosiaris <[email protected]> Gerrit-Reviewer: Chad <[email protected]> Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Greg Grossmeier <[email protected]> Gerrit-Reviewer: Hashar <[email protected]> Gerrit-Reviewer: Thcipriani <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
