Thcipriani has uploaded a new change for review. https://gerrit.wikimedia.org/r/199988
Change subject: Trebuchet group wikidev; mw-staging owner mwdeploy ...................................................................... Trebuchet group wikidev; mw-staging owner mwdeploy Change ownership of files on {tin,deployment-bastion} to correct recent permissions problems that arose from combining role::deployment::server::{production,labs} into role::deployment::server (I3e947637b49ce2a94128e21db35798a49e8d45e8) Bug: T94054 Change-Id: I0b391b1c50857794d1526edc2c80e3c87b67ef8c --- M hieradata/labs/deployment-prep/common.yaml M hieradata/labs/staging/common.yaml M manifests/role/deployment.pp M modules/scap/manifests/master.pp 4 files changed, 4 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/88/199988/1 diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 9a56dd2..86640cc 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -180,6 +180,5 @@ "role::url_downloader::url_downloader_ip": 10.68.16.135 "zotero::http_proxy": deployment-urldownloader.eqiad.wmflabs:8080 "role::trebuchet::deployment_server": deployment-bastion.eqiad.wmflabs -"role::deployment::server::deployment_group": 'project-deployment-prep' "dsh::config::group_source": 'puppet:///modules/beta/dsh/group' "mediawiki::users::mwdeploy_pub_key": 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFwlmBBBJAr1GI+vuYjFh5vq0YIVa5fqE5DZdpzUZISlQ0Kt+9bIr2qNHIj+Jl5Bc6ZY1mkh8l693tAHVx+8tayoiFWYNs9IVsxR+iHgOOhAdDIBXaHaUattdiye5bQmdvJVXaVegckNX2gbmUCOc09jvZvlk3blKFTSEpZRU8dmpXQzKdZgaAq2VTajAegoFnuN9FbC7hzBPA+1NxFNKn94eIeFPSlo5rWr44OEb5Uy3O0B5c6WPM+IgfiygetP+yGL4cKv7qEjZ0Sxok/Rh1lBh1vP1YQ/Mc6tMV0s+kOv7Wz+P88bfU1/uWvy479OZdfh3NQqDTrLzqHwVW1vef root@deployment-salt' diff --git a/hieradata/labs/staging/common.yaml b/hieradata/labs/staging/common.yaml index 51e4f1e..41d510e 100644 --- a/hieradata/labs/staging/common.yaml +++ b/hieradata/labs/staging/common.yaml @@ -6,6 +6,5 @@ salt::master::salt_pillar_roots: { base: [ '/srv/pillars' ] } salt::master::salt_module_roots: { base: [ '/srv/salt/_modules' ] } salt::master::salt_returner_roots: { base: [ '/srv/salt/_returners' ] } -role::deployment::server::deployment_group: 'project-staging' role::deployment::salt_masters::deployment_server: staging-tin.eqiad.wmflabs role::trebuchet::deployment_server: staging-tin.eqiad.wmflabs diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp index e9c5d8c..636cd95 100644 --- a/manifests/role/deployment.pp +++ b/manifests/role/deployment.pp @@ -156,10 +156,7 @@ $deployable_networks = $::network::constants::deployable_networks include mediawiki - - class { 'scap::master': - deployment_group => $deployment_group, - } + include scap::master if $::realm != 'labs' { include wikitech::wiki::passwords diff --git a/modules/scap/manifests/master.pp b/modules/scap/manifests/master.pp index 51720f1..7340343 100644 --- a/modules/scap/manifests/master.pp +++ b/modules/scap/manifests/master.pp @@ -1,6 +1,6 @@ # = class: scap::master # -# Sets up a scap master (currently tin). +# Sets up a scap master (currently tin) class scap::master( $common_path = '/srv/mediawiki', $common_source_path = '/srv/mediawiki-staging', @@ -8,6 +8,7 @@ $statsd_host = 'statsd.eqiad.wmnet', $statsd_port = 8125, $deployment_group = 'wikidev', + $staging_group = 'mwdeploy', ) { include scap::scripts include rsync::server @@ -17,7 +18,7 @@ git::clone { 'operations/mediawiki-config': directory => $common_source_path, ensure => present, - group => $deployment_group, + group => $staging_group, shared => true, } -- To view, visit https://gerrit.wikimedia.org/r/199988 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0b391b1c50857794d1526edc2c80e3c87b67ef8c 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