opendev
/
system-config
Code Issues Proposed changes

Revert "Configure swift credentials for workers to push to" 

This reverts commit 176f15cd48.

Puppet and zuul aren't ready for this. The swift client throws an
exception. We need to restart zuul to fix a more pressing issue hence
this revert. Will debug when able to.

Change-Id: Ie4487d84b7f1495c7ec6fd31e4b5b90d6699a31d
This commit is contained in:
Clark Boylan 2014-05-05 18:48:42 -07:00
parent e16d0d11b5
commit c1b98eaff6
4 changed files with 21 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
manifests/site.pp
View File

@ -425,22 +425,15 @@ node 'nodepool.openstack.org' {
node 'zuul.openstack.org' {
class { 'openstack_project::zuul_prod':
gerrit_server => 'review.openstack.org',
gerrit_user => 'jenkins',
gerrit_ssh_host_key => hiera('gerrit_ssh_rsa_pubkey_contents'),
zuul_ssh_private_key => hiera('zuul_ssh_private_key_contents'),
url_pattern => 'http://logs.openstack.org/{build.parameters[LOG_PATH]}',
swift_authurl => 'https://identity.api.rackspacecloud.com/v2.0/',
swift_user => 'infra-files-rw',
swift_key => hiera('infra_files_rw_password'),
swift_tenant_name => 'openstackjenkins',
swift_region_name => 'DFW',
swift_default_container => 'infra-files',
swift_default_logserver_prefix => 'http://logs.openstack.org/',
zuul_url => 'http://zuul.openstack.org/p',
sysadmins => hiera('sysadmins'),
statsd_host => 'graphite.openstack.org',
gearman_workers => [
gerrit_server => 'review.openstack.org',
gerrit_user => 'jenkins',
gerrit_ssh_host_key => hiera('gerrit_ssh_rsa_pubkey_contents'),
zuul_ssh_private_key => hiera('zuul_ssh_private_key_contents'),
url_pattern => 'http://logs.openstack.org/{build.parameters[LOG_PATH]}',
zuul_url => 'http://zuul.openstack.org/p',
sysadmins => hiera('sysadmins'),
statsd_host => 'graphite.openstack.org',
gearman_workers => [
'nodepool.openstack.org',
'jenkins.openstack.org',
'jenkins01.openstack.org',

38
modules/openstack_project/manifests/zuul_prod.pp
View File

@ -9,13 +9,6 @@ class openstack_project::zuul_prod(
$zuul_ssh_private_key = '',
$url_pattern = '',
$zuul_url = '',
$swift_authurl = '',
$swift_user = '',
$swift_key = '',
$swift_tenant_name = '',
$swift_region_name = '',
$swift_default_container = '',
$swift_default_logserver_prefix = '',
$sysadmins = [],
$statsd_host = '',
$gearman_workers = [],
@ -31,25 +24,18 @@ class openstack_project::zuul_prod(
}
class { '::zuul':
vhost_name => $vhost_name,
gearman_server => $gearman_server,
gerrit_server => $gerrit_server,
gerrit_user => $gerrit_user,
zuul_ssh_private_key => $zuul_ssh_private_key,
url_pattern => $url_pattern,
zuul_url => $zuul_url,
job_name_in_report => true,
status_url => 'http://status.openstack.org/zuul/',
statsd_host => $statsd_host,
git_email => 'jenkins@openstack.org',
git_name => 'OpenStack Jenkins',
swift_authurl => $swift_authurl,
swift_user => $swift_user,
swift_key => $swift_key,
swift_tenant_name => $swift_tenant_name,
swift_region_name => $swift_region_name,
swift_default_container => $swift_default_container,
swift_default_logserver_prefix => $swift_default_logserver_prefix,
vhost_name => $vhost_name,
gearman_server => $gearman_server,
gerrit_server => $gerrit_server,
gerrit_user => $gerrit_user,
zuul_ssh_private_key => $zuul_ssh_private_key,
url_pattern => $url_pattern,
zuul_url => $zuul_url,
job_name_in_report => true,
status_url => 'http://status.openstack.org/zuul/',
statsd_host => $statsd_host,
git_email => 'jenkins@openstack.org',
git_name => 'OpenStack Jenkins',
}
class { '::zuul::server': }

7
modules/zuul/manifests/init.pp
View File

@ -34,13 +34,6 @@ class zuul (
$statsd_host = '',
$git_email = '',
$git_name = '',
$swift_authurl = '',
$swift_user = '',
$swift_key = '',
$swift_tenant_name = '',
$swift_region_name = '',
$swift_default_container = '',
$swift_default_logserver_prefix = '',
) {
include apache
include pip

11
modules/zuul/templates/zuul.conf.erb
View File

@ -30,14 +30,3 @@ git_user_email=<%= git_email %>
<% if git_name != "" -%>
git_user_name=<%= git_name %>
<% end -%>
<% if swift_authurl != "" -%>
[swift]
authurl=<%= swift_authurl %>
user=<%= swift_user %>
key=<%= swift_key %>
tenant_name=<%= swift_tenant_name %>
region_name=<%= swift_region_name %>
default_container=<%= swift_default_container %>
default_logserver_prefix=<%= swift_default_logserver_prefix %>
<% end -%>