From 060ea23238736531bb5b50c8fe0a5b6363cf2575 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Fri, 20 Mar 2015 17:06:16 +1100 Subject: [PATCH] Use zanata::client in proposal slave Due to the specification to move from Transifex to Zanata, change the proposal slave to grab the zanata-cli utility by using the new zanata::client puppet module. Change-Id: I7b632527d56365364063632fc8506718eada5b86 Depends-On: I979a1fd1a37b69b2a1d7c0a2c647d87fc4f0eb6d --- modules.env | 1 + modules/openstack_project/manifests/proposal_slave.pp | 1 + 2 files changed, 2 insertions(+) diff --git a/modules.env b/modules.env index 9c474d72de..b4c3259e73 100644 --- a/modules.env +++ b/modules.env @@ -113,6 +113,7 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-ulimit"]="origin INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-unattended_upgrades"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-unbound"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-user"]="origin/master" +INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-zanata"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-zuul"]="origin/master" if [[ "$PUPPET_INTEGRATION_TEST" -ne "1" ]]; then diff --git a/modules/openstack_project/manifests/proposal_slave.pp b/modules/openstack_project/manifests/proposal_slave.pp index d568726e78..4814472705 100644 --- a/modules/openstack_project/manifests/proposal_slave.pp +++ b/modules/openstack_project/manifests/proposal_slave.pp @@ -10,6 +10,7 @@ class openstack_project::proposal_slave ( $transifex_password = '', $transifex_username = 'openstackci', ) { + include zanata::client class { 'openstack_project::slave': ssh_key => $jenkins_ssh_public_key,