From c1b98eaff618b8c739cc02f089ef6fe6c02cbcc3 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 5 May 2014 18:48:42 -0700 Subject: [PATCH] Revert "Configure swift credentials for workers to push to" This reverts commit 176f15cd48ceea7e990fc61362875a23524f963a. 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 --- manifests/site.pp | 25 +++++------- .../openstack_project/manifests/zuul_prod.pp | 38 ++++++------------- modules/zuul/manifests/init.pp | 7 ---- modules/zuul/templates/zuul.conf.erb | 11 ------ 4 files changed, 21 insertions(+), 60 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 3d19a33509..38f2028de8 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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', diff --git a/modules/openstack_project/manifests/zuul_prod.pp b/modules/openstack_project/manifests/zuul_prod.pp index 76e01734a3..7c6f1fcde2 100644 --- a/modules/openstack_project/manifests/zuul_prod.pp +++ b/modules/openstack_project/manifests/zuul_prod.pp @@ -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': } diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp index 754d7a0056..3bb13d9296 100644 --- a/modules/zuul/manifests/init.pp +++ b/modules/zuul/manifests/init.pp @@ -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 diff --git a/modules/zuul/templates/zuul.conf.erb b/modules/zuul/templates/zuul.conf.erb index f9a52c3925..fba83fbeee 100644 --- a/modules/zuul/templates/zuul.conf.erb +++ b/modules/zuul/templates/zuul.conf.erb @@ -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 -%> \ No newline at end of file