opendev/system-config
Code Issues Proposed changes

Merge "Cleanup unneeded Jenkins vars."

Browse Source
This commit is contained in:
Jenkins 2013-08-05 17:27:44 +00:00 committed by Gerrit Code Review
commit 5a3898ed1e
5 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/site.pp
View File

@ -308,10 +308,6 @@ node 'static.openstack.org' {
node 'zuul.openstack.org' { node 'zuul.openstack.org' {
class { 'openstack_project::zuul_prod': class { 'openstack_project::zuul_prod':
jenkins_host => 'jenkins.openstack.org',
jenkins_url => 'https://jenkins.openstack.org',
jenkins_user => hiera('jenkins_api_user'),
jenkins_apikey => hiera('jenkins_api_key'),
gerrit_server => 'review.openstack.org', gerrit_server => 'review.openstack.org',
gerrit_user => 'jenkins', gerrit_user => 'jenkins',
zuul_ssh_private_key => hiera('jenkins_ssh_private_key_contents'), zuul_ssh_private_key => hiera('jenkins_ssh_private_key_contents'),

4
modules/openstack_project/manifests/zuul_dev.pp
View File

@ -2,10 +2,6 @@
# #
class openstack_project::zuul_dev( class openstack_project::zuul_dev(
$vhost_name = $::fqdn, $vhost_name = $::fqdn,
$jenkins_host = '',
$jenkins_url = '',
$jenkins_user = '',
$jenkins_apikey = '',
$gerrit_server = '', $gerrit_server = '',
$gerrit_user = '', $gerrit_user = '',
$zuul_ssh_private_key = '', $zuul_ssh_private_key = '',

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

@ -2,10 +2,6 @@
# #
class openstack_project::zuul_prod( class openstack_project::zuul_prod(
$vhost_name = $::fqdn, $vhost_name = $::fqdn,
$jenkins_host = '',
$jenkins_url = '',
$jenkins_user = '',
$jenkins_apikey = '',
$gerrit_server = '', $gerrit_server = '',
$gerrit_user = '', $gerrit_user = '',
$zuul_ssh_private_key = '', $zuul_ssh_private_key = '',

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

@ -22,9 +22,6 @@ class zuul (
$serveradmin = "webmaster@${::fqdn}", $serveradmin = "webmaster@${::fqdn}",
$gearman_server = '127.0.0.1', $gearman_server = '127.0.0.1',
$internal_gearman = true, $internal_gearman = true,
$jenkins_server = '',
$jenkins_user = '',
$jenkins_apikey = '',
$gerrit_server = '', $gerrit_server = '',
$gerrit_user = '', $gerrit_user = '',
$zuul_ssh_private_key = '', $zuul_ssh_private_key = '',

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

@ -5,11 +5,6 @@ server=<%= gearman_server %>
start=<%= internal_gearman %> start=<%= internal_gearman %>
log_config=/etc/zuul/gearman-logging.conf log_config=/etc/zuul/gearman-logging.conf
[jenkins]
server=<%= jenkins_server %>
user=<%= jenkins_user %>
apikey=<%= jenkins_apikey %>
[gerrit] [gerrit]
server=<%= gerrit_server %> server=<%= gerrit_server %>
user=<%= gerrit_user %> user=<%= gerrit_user %>