Merge "Cleanup unneeded Jenkins vars."

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'),

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 = '',

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 = '',

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 = '',

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 %>