Merge "Use zanata::client in proposal slave"

This commit is contained in:
Jenkins 2015-04-09 21:14:09 +00:00 committed by Gerrit Code Review
commit b42d9da819
2 changed files with 2 additions and 0 deletions

View File

@ -114,6 +114,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-unattended_upgrades"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-unbound"]="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-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" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-zuul"]="origin/master"
if [[ "$PUPPET_INTEGRATION_TEST" -ne "1" ]]; then if [[ "$PUPPET_INTEGRATION_TEST" -ne "1" ]]; then

View File

@ -10,6 +10,7 @@ class openstack_project::proposal_slave (
$transifex_password = '', $transifex_password = '',
$transifex_username = 'openstackci', $transifex_username = 'openstackci',
) { ) {
include zanata::client
class { 'openstack_project::slave': class { 'openstack_project::slave':
ssh_key => $jenkins_ssh_public_key, ssh_key => $jenkins_ssh_public_key,