Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/255082
Change subject: role: Move quarry to use autolayout ...................................................................... role: Move quarry to use autolayout Change-Id: If3ebe3c804de25029e0f176dae6d7b24fb4f8eda --- D manifests/role/labsquarry.pp A manifests/role/quarry.pp 2 files changed, 43 insertions(+), 39 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/82/255082/1 diff --git a/manifests/role/labsquarry.pp b/manifests/role/labsquarry.pp deleted file mode 100644 index 7fb90c0..0000000 --- a/manifests/role/labsquarry.pp +++ /dev/null @@ -1,39 +0,0 @@ -class role::labs::quarry::web { - include role::labs::lvm::srv - include ::labs_debrepo - - class { '::quarry::web': - require => [Mount['/srv'], Class['::labs_debrepo']], - } -} - -class role::labs::quarry::celeryrunner { - include role::labs::lvm::srv - include ::labs_debrepo - - class { '::quarry::celeryrunner': - require => [Mount['/srv'], Class['::labs_debrepo']], - } -} - -class role::labs::quarry::database { - include role::labs::lvm::srv - - class { '::quarry::database': - require => Mount['/srv'] - } -} - -class role::labs::quarry::redis { - include role::labs::lvm::srv - - class { '::quarry::redis': - require => Mount['/srv'] - } -} - -# Should be included on an instance that already has -# a Quarry install (celery or web) setup -class role::labs::quarry::killer { - include quarry::querykiller -} diff --git a/manifests/role/quarry.pp b/manifests/role/quarry.pp new file mode 100644 index 0000000..46845a1 --- /dev/null +++ b/manifests/role/quarry.pp @@ -0,0 +1,43 @@ +class role::quarry::web { + include ::labs_debrepo + + requires_realm('labs') + + class { '::quarry::web': + require => Class['::labs_debrepo'], + } +} + +class role::quarry::celeryrunner { + include ::labs_debrepo + + requires_realm('labs') + + class { '::quarry::celeryrunner': + require => Class['::labs_debrepo'], + } +} + +class role::quarry::database { + + requires_realm('labs') + + class { '::quarry::database': + } +} + +class role::quarry::redis { + include role::labs::lvm::srv + + requires_realm('labs') + + class { '::quarry::redis': + require => Mount['/srv'] + } +} + +# Should be included on an instance that already has +# a Quarry install (celery or web) setup +class role::quarry::killer { + include quarry::querykiller +} -- To view, visit https://gerrit.wikimedia.org/r/255082 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If3ebe3c804de25029e0f176dae6d7b24fb4f8eda Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits