Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/379503 )
Change subject: service: remove trebuchet references ...................................................................... service: remove trebuchet references Change-Id: I4b661c1b86897073b17f7f222798d031aa73b5da --- M modules/service/.fixtures.yml D modules/service/manifests/deploy/trebuchet.pp M modules/service/manifests/node.pp M modules/service/spec/defines/service_node_spec.rb A modules/service/spec/fixtures/modules/secret/secrets/keyholder/deploy_service.pub 5 files changed, 27 insertions(+), 43 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/service/.fixtures.yml b/modules/service/.fixtures.yml index 9a16361..86865bf 100644 --- a/modules/service/.fixtures.yml +++ b/modules/service/.fixtures.yml @@ -9,5 +9,8 @@ scap: "../../../../scap" stdlib: "../../../../stdlib" systemd: "../../../../systemd" - trebuchet: "../../../../trebuchet" wmflib: "../../../../wmflib" + conftool: "../../../../conftool" + ssh: "../../../../ssh" + sudo: "../../../../sudo" + etcd: "../../../../etcd" diff --git a/modules/service/manifests/deploy/trebuchet.pp b/modules/service/manifests/deploy/trebuchet.pp deleted file mode 100644 index c64a7d0..0000000 --- a/modules/service/manifests/deploy/trebuchet.pp +++ /dev/null @@ -1,14 +0,0 @@ -# == Define service::deploy::trebuchet -# -# Deploys services on nodes via trebuchet package provider. -# -# This class should be removed once scap deploys all services. -# -define service::deploy::trebuchet { - require ::service::deploy::common - if ! defined(Package[$title]) { - package { $title: - provider => 'trebuchet', - } - } -} diff --git a/modules/service/manifests/node.pp b/modules/service/manifests/node.pp index f41a453..b91938b 100644 --- a/modules/service/manifests/node.pp +++ b/modules/service/manifests/node.pp @@ -177,8 +177,14 @@ $contact_groups = hiera('contactgroups', 'admins'), ) { case $deployment { - 'scap3': { - if ! defined(Service::Deploy::Trebuchet[$repo]) and ! defined(Scap::Target[$repo]) { + 'git': { + service::deploy::gitclone { $title: + repository => $repo, + before => Base::Service_unit[$title], + } + } + default: { + if ! defined(Scap::Target[$repo]) { require ::service::deploy::common scap::target { $repo: service_name => $title, @@ -188,19 +194,6 @@ } } include ::scap::conftool - } - 'git': { - service::deploy::gitclone { $title: - repository => $repo, - before => Base::Service_unit[$title], - } - } - default: { - if ! defined(Service::Deploy::Trebuchet[$repo]) { - service::deploy::trebuchet{ $repo: - before => Base::Service_unit[$title] - } - } } } diff --git a/modules/service/spec/defines/service_node_spec.rb b/modules/service/spec/defines/service_node_spec.rb index 702eb43..7d2fd92 100644 --- a/modules/service/spec/defines/service_node_spec.rb +++ b/modules/service/spec/defines/service_node_spec.rb @@ -1,24 +1,26 @@ require 'spec_helper' describe 'service::node', :type => :define do + let(:pre_condition) { + ['class passwords::etcd { $accounts = {}}', + 'include ::passwords::etcd', + 'class profile::base { + $notifications_enabled = "1" +} +include ::profile::base' + ] + } let(:title) { 'my_service_name' } let(:facts) { { :initsystem => 'systemd' } } - let(:node_params) { {'cluster' => 'test', 'site' => 'eqiad'} } - let(:pre_condition) { """ -class profile::base { - $notifications_enabled = '1' -} -include ::profile::base -""" } + let(:node_params) { {'cluster' => 'test', 'site' => 'eqiad', 'realm' => 'production'} } context 'when only port is given' do let(:params) { { :port => 1234 } } - it 'create application config file' do - is_expected.to contain_file('/etc/my_service_name/config.yaml') - end - it 'contains a service named after the application' do - is_expected.to contain_file('/etc/my_service_name/config.yaml') - .with_content(/name: my_service_name/) + it { is_expected.to compile } + + it 'create the appropriate scap target' do + is_expected.to contain_scap__target('my_service_name/deploy') + .with_service_name('my_service_name') end end end diff --git a/modules/service/spec/fixtures/modules/secret/secrets/keyholder/deploy_service.pub b/modules/service/spec/fixtures/modules/secret/secrets/keyholder/deploy_service.pub new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/modules/service/spec/fixtures/modules/secret/secrets/keyholder/deploy_service.pub -- To view, visit https://gerrit.wikimedia.org/r/379503 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4b661c1b86897073b17f7f222798d031aa73b5da Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits