opendev/system-config
Code Issues Proposed changes

Merge "Pass through zanata client parameters"

Browse Source
This commit is contained in:
Jenkins 2015-07-14 16:53:43 +00:00 committed by Gerrit Code Review
commit 5f4fba8f45
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/site.pp
View File

@ -685,6 +685,9 @@ node 'proposal.slave.openstack.org' {
jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key, jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key,
proposal_ssh_public_key => hiera('proposal_ssh_public_key_contents', 'XXX'), proposal_ssh_public_key => hiera('proposal_ssh_public_key_contents', 'XXX'),
proposal_ssh_private_key => hiera('proposal_ssh_private_key_contents', 'XXX'), proposal_ssh_private_key => hiera('proposal_ssh_private_key_contents', 'XXX'),
zanata_server_url => 'https://translate-dev.openstack.org',
zanata_server_user => hiera('proposal_zanata_user', 'XXX'),
zanata_server_api_key => hiera('proposal_zanata_api_key', 'XXX'),
} }
} }

10
modules/openstack_project/manifests/proposal_slave.pp
View File

@ -12,8 +12,16 @@ class openstack_project::proposal_slave (
$jenkins_gitfullname = 'OpenStack Jenkins', $jenkins_gitfullname = 'OpenStack Jenkins',
$jenkins_gitemail = 'jenkins@openstack.org', $jenkins_gitemail = 'jenkins@openstack.org',
$project_config_repo = 'https://git.openstack.org/openstack-infra/project-config', $project_config_repo = 'https://git.openstack.org/openstack-infra/project-config',
$zanata_server_url,
$zanata_server_user,
$zanata_server_api_key,
) { ) {
include zanata::client
class { '::zanata::client':
server_url => $zanata_server_url,
server_user => $zanata_server_user,
server_api_key => $zanata_server_api_key,
}
class { 'openstack_project::slave': class { 'openstack_project::slave':
ssh_key => $jenkins_ssh_public_key, ssh_key => $jenkins_ssh_public_key,