From 0c1dd8f4717e66bd0552f01f93c95cbe89dfdd27 Mon Sep 17 00:00:00 2001
From: stephane <stephane@alum.mit.edu>
Date: Wed, 22 Apr 2015 12:12:49 -0700
Subject: [PATCH] Pass through zanata client parameters
The zanata client needs the server URL, username, and API key to
push and pull translations to the Zanata server. Pass them through
for the development instance.
Co-Authored-By: Steve Kowalik <steven@wedontsleep.org>
Depends-On: I754ee54f805c91f5548b2cf270b23c68eed3959c
Change-Id: I2195b0db7add7cfece1b0560e0b2cc4d4221ebe2
---
manifests/site.pp | 3 +++
modules/openstack_project/manifests/proposal_slave.pp | 10 +++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/manifests/site.pp b/manifests/site.pp
index 4fc7a92723..bef235bccf 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -669,6 +669,9 @@ node 'proposal.slave.openstack.org' {
jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key,
proposal_ssh_public_key => hiera('proposal_ssh_public_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'),
}
}
diff --git a/modules/openstack_project/manifests/proposal_slave.pp b/modules/openstack_project/manifests/proposal_slave.pp
index 3f20a6053b..03d40f4c32 100644
--- a/modules/openstack_project/manifests/proposal_slave.pp
+++ b/modules/openstack_project/manifests/proposal_slave.pp
@@ -12,8 +12,16 @@ class openstack_project::proposal_slave (
$jenkins_gitfullname = 'OpenStack Jenkins',
$jenkins_gitemail = 'jenkins@openstack.org',
$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':
ssh_key => $jenkins_ssh_public_key,