opendev/system-config
Code Issues Proposed changes

Merge "Revert "Configure swift credentials for workers to push to""

Browse Source
This commit is contained in:
Jenkins 2014-05-06 13:32:44 +00:00 committed by Gerrit Code Review
commit 03d610d3e6
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' { node 'zuul.openstack.org' {
class { 'openstack_project::zuul_prod': class { 'openstack_project::zuul_prod':
gerrit_server => 'review.openstack.org', gerrit_server => 'review.openstack.org',
gerrit_user => 'jenkins', gerrit_user => 'jenkins',
gerrit_ssh_host_key => hiera('gerrit_ssh_rsa_pubkey_contents'), gerrit_ssh_host_key => hiera('gerrit_ssh_rsa_pubkey_contents'),
zuul_ssh_private_key => hiera('zuul_ssh_private_key_contents'), zuul_ssh_private_key => hiera('zuul_ssh_private_key_contents'),
url_pattern => 'http://logs.openstack.org/{build.parameters[LOG_PATH]}', url_pattern => 'http://logs.openstack.org/{build.parameters[LOG_PATH]}',
swift_authurl => 'https://identity.api.rackspacecloud.com/v2.0/', zuul_url => 'http://zuul.openstack.org/p',
swift_user => 'infra-files-rw', sysadmins => hiera('sysadmins'),
swift_key => hiera('infra_files_rw_password'), statsd_host => 'graphite.openstack.org',
swift_tenant_name => 'openstackjenkins', gearman_workers => [
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 => [
'nodepool.openstack.org', 'nodepool.openstack.org',
'jenkins.openstack.org', 'jenkins.openstack.org',
'jenkins01.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 = '', $zuul_ssh_private_key = '',
$url_pattern = '', $url_pattern = '',
$zuul_url = '', $zuul_url = '',
$swift_authurl = '',
$swift_user = '',
$swift_key = '',
$swift_tenant_name = '',
$swift_region_name = '',
$swift_default_container = '',
$swift_default_logserver_prefix = '',
$sysadmins = [], $sysadmins = [],
$statsd_host = '', $statsd_host = '',
$gearman_workers = [], $gearman_workers = [],
@ -31,25 +24,18 @@ class openstack_project::zuul_prod(
} }
class { '::zuul': class { '::zuul':
vhost_name => $vhost_name, vhost_name => $vhost_name,
gearman_server => $gearman_server, gearman_server => $gearman_server,
gerrit_server => $gerrit_server, gerrit_server => $gerrit_server,
gerrit_user => $gerrit_user, gerrit_user => $gerrit_user,
zuul_ssh_private_key => $zuul_ssh_private_key, zuul_ssh_private_key => $zuul_ssh_private_key,
url_pattern => $url_pattern, url_pattern => $url_pattern,
zuul_url => $zuul_url, zuul_url => $zuul_url,
job_name_in_report => true, job_name_in_report => true,
status_url => 'http://status.openstack.org/zuul/', status_url => 'http://status.openstack.org/zuul/',
statsd_host => $statsd_host, statsd_host => $statsd_host,
git_email => 'jenkins@openstack.org', git_email => 'jenkins@openstack.org',
git_name => 'OpenStack Jenkins', 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,
} }
class { '::zuul::server': } class { '::zuul::server': }

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

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

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

@ -30,14 +30,3 @@ git_user_email=<%= git_email %>
<% if git_name != "" -%> <% if git_name != "" -%>
git_user_name=<%= git_name %> git_user_name=<%= git_name %>
<% end -%> <% 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 -%>