diff --git a/manifests/site.pp b/manifests/site.pp index a90fda84a8..3f0d45da50 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -308,10 +308,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'), diff --git a/modules/openstack_project/manifests/zuul_dev.pp b/modules/openstack_project/manifests/zuul_dev.pp index 253ffb42a1..8e62c251c3 100644 --- a/modules/openstack_project/manifests/zuul_dev.pp +++ b/modules/openstack_project/manifests/zuul_dev.pp @@ -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 = '', diff --git a/modules/openstack_project/manifests/zuul_prod.pp b/modules/openstack_project/manifests/zuul_prod.pp index 297a25abc3..ab9a30055b 100644 --- a/modules/openstack_project/manifests/zuul_prod.pp +++ b/modules/openstack_project/manifests/zuul_prod.pp @@ -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 = '', diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp index 4efc5e0264..3acb75952e 100644 --- a/modules/zuul/manifests/init.pp +++ b/modules/zuul/manifests/init.pp @@ -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 = '', diff --git a/modules/zuul/templates/zuul.conf.erb b/modules/zuul/templates/zuul.conf.erb index e1b1771813..4cbd57e7c6 100644 --- a/modules/zuul/templates/zuul.conf.erb +++ b/modules/zuul/templates/zuul.conf.erb @@ -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 %>