Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/316512
Change subject: deployment-prep: Make LVS config compatible with new requirements ...................................................................... deployment-prep: Make LVS config compatible with new requirements I couldn't get LVS working in the labs network, so this just has the minimum required to stop puppet breaking on instances using these roles. Change-Id: I844fdb54cea786b4e7c0ed8dca7091eaffa900d8 --- M hieradata/labs/deployment-prep/common.yaml M modules/lvs/manifests/configuration.pp 2 files changed, 37 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/12/316512/1 diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 216c65e..14e27f2 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -66,6 +66,41 @@ conftool: cluster: appserver service: apache2 + restbase: + class: low-traffic + conftool: + cluster: restbase + service: restbase + apertium: + class: low-traffic + conftool: + cluster: scb + service: apertium + mathoid: + class: low-traffic + conftool: + cluster: scb + service: mathoid + citoid: + class: low-traffic + conftool: + cluster: scb + service: citoid + graphoid: + class: low-traffic + conftool: + cluster: scb + service: graphoid + cxserver: + class: low-traffic + conftool: + cluster: scb + service: cxserver + ores: + class: low-traffic + conftool: + cluster: scb + service: ores lvs::configuration::lvs_service_ips: apaches: eqiad: dummy diff --git a/modules/lvs/manifests/configuration.pp b/modules/lvs/manifests/configuration.pp index 4978dae..b571010 100644 --- a/modules/lvs/manifests/configuration.pp +++ b/modules/lvs/manifests/configuration.pp @@ -37,7 +37,8 @@ 'ulsfo' => [ ], default => undef, }, - 'labs' => $::site ? { + 'labs' => $::labsproject ? { + 'deployment-prep' => [ ], default => undef, }, default => undef, -- To view, visit https://gerrit.wikimedia.org/r/316512 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I844fdb54cea786b4e7c0ed8dca7091eaffa900d8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alex Monk <a...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits