Merge "Remove transifex from the proposal slave"

This commit is contained in:
Jenkins 2015-09-24 16:46:46 +00:00 committed by Gerrit Code Review
commit 0920bcbbbc
3 changed files with 1 additions and 19 deletions

View File

@ -782,8 +782,6 @@ node /^ci-backup-.*\.openstack\.org$/ {
node 'proposal.slave.openstack.org' {
include openstack_project
class { 'openstack_project::proposal_slave':
transifex_username => 'openstackjenkins',
transifex_password => hiera('transifex_password', 'XXX'),
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'),

View File

@ -7,8 +7,6 @@ class openstack_project::proposal_slave (
$jenkins_ssh_public_key,
$proposal_ssh_public_key,
$proposal_ssh_private_key,
$transifex_password = '',
$transifex_username = 'openstackci',
$jenkins_gitfullname = 'OpenStack Jenkins',
$jenkins_gitemail = 'jenkins@openstack.org',
$project_config_repo = 'https://git.openstack.org/openstack-infra/project-config',
@ -30,21 +28,12 @@ class openstack_project::proposal_slave (
project_config_repo => $project_config_repo,
}
package { ['transifex-client', 'Babel', 'pyopenssl', 'ndg-httpsclient', 'pyasn1']:
package { ['Babel', 'pyopenssl', 'ndg-httpsclient', 'pyasn1']:
ensure => latest,
provider => pip,
require => Class['pip'],
}
file { '/home/jenkins/.transifexrc':
ensure => present,
owner => 'jenkins',
group => 'jenkins',
mode => '0600',
content => template('openstack_project/transifexrc.erb'),
require => User['jenkins'],
}
file { '/home/jenkins/.ssh/id_rsa':
owner => 'jenkins',
group => 'jenkins',

View File

@ -1,5 +0,0 @@
[https://www.transifex.com]
hostname = https://www.transifex.com
password = <%= transifex_password %>
token =
username = <%= transifex_username %>