Cleanup unneeded Jenkins vars.
Now that Zuul and Jenkins use Gearman we don't need to push Jenkins auth details down into the zuul manifests. Removes these parameters and vars. Change-Id: I744977f002eb9fb60c3392f0281ab033ffe2bb12
This commit is contained in:
parent
fb99b4fa74
commit
663fd2225f
@ -329,10 +329,6 @@ node 'static.openstack.org' {
|
||||
|
||||
node 'zuul.openstack.org' {
|
||||
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_user => 'jenkins',
|
||||
zuul_ssh_private_key => hiera('jenkins_ssh_private_key_contents'),
|
||||
|
@ -2,10 +2,6 @@
|
||||
#
|
||||
class openstack_project::zuul_dev(
|
||||
$vhost_name = $::fqdn,
|
||||
$jenkins_host = '',
|
||||
$jenkins_url = '',
|
||||
$jenkins_user = '',
|
||||
$jenkins_apikey = '',
|
||||
$gerrit_server = '',
|
||||
$gerrit_user = '',
|
||||
$zuul_ssh_private_key = '',
|
||||
|
@ -2,10 +2,6 @@
|
||||
#
|
||||
class openstack_project::zuul_prod(
|
||||
$vhost_name = $::fqdn,
|
||||
$jenkins_host = '',
|
||||
$jenkins_url = '',
|
||||
$jenkins_user = '',
|
||||
$jenkins_apikey = '',
|
||||
$gerrit_server = '',
|
||||
$gerrit_user = '',
|
||||
$zuul_ssh_private_key = '',
|
||||
|
@ -22,9 +22,6 @@ class zuul (
|
||||
$serveradmin = "webmaster@${::fqdn}",
|
||||
$gearman_server = '127.0.0.1',
|
||||
$internal_gearman = true,
|
||||
$jenkins_server = '',
|
||||
$jenkins_user = '',
|
||||
$jenkins_apikey = '',
|
||||
$gerrit_server = '',
|
||||
$gerrit_user = '',
|
||||
$zuul_ssh_private_key = '',
|
||||
|
@ -5,11 +5,6 @@ server=<%= gearman_server %>
|
||||
start=<%= internal_gearman %>
|
||||
log_config=/etc/zuul/gearman-logging.conf
|
||||
|
||||
[jenkins]
|
||||
server=<%= jenkins_server %>
|
||||
user=<%= jenkins_user %>
|
||||
apikey=<%= jenkins_apikey %>
|
||||
|
||||
[gerrit]
|
||||
server=<%= gerrit_server %>
|
||||
user=<%= gerrit_user %>
|
||||
|
Loading…
Reference in New Issue
Block a user