From bded993bfc3c1af697005644f79f5327243e722c Mon Sep 17 00:00:00 2001
From: Tristan Cacqueray <tdecacqu@redhat.com>
Date: Thu, 21 Dec 2017 06:39:18 +0000
Subject: [PATCH] Missing fixes related to jenkins/zuul-launcher

Change-Id: I511ae952ba6a9fede0b5e79cb8e4291cf99f6741
---
 ansible/roles/sf-jenkins/defaults/main.yml            | 6 +++---
 ansible/roles/sf-nodepool/templates/_nodepool.yaml.j2 | 2 ++
 ansible/roles/sf-zuul/templates/zuul.conf.j2          | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ansible/roles/sf-jenkins/defaults/main.yml b/ansible/roles/sf-jenkins/defaults/main.yml
index 0facc7c67..3a12c1580 100644
--- a/ansible/roles/sf-jenkins/defaults/main.yml
+++ b/ansible/roles/sf-jenkins/defaults/main.yml
@@ -10,9 +10,9 @@ role_actions:
   - disable
 
 jenkins_repo_name: jenkins
-jenkins_repo_desc: Jenkins repository
-jenkins_repo_url: https://pkg.jenkins.io/redhat-stable/
-jenkins_repo_gpgkey: https://pkg.jenkins.io/redhat-stable/jenkins.io.key
+jenkins_repo_desc: Jenkins-1.x repository
+jenkins_repo_url: https://softwarefactory-project.io/mirrors/repos/jenkins/
+jenkins_repo_gpgkey: https://softwarefactory-project.io/mirrors/repos/jenkins/jenkins.io.key
 jenkins_repo_gpgcheck: 1
 
 jenkins_heap_limit: 256m
diff --git a/ansible/roles/sf-nodepool/templates/_nodepool.yaml.j2 b/ansible/roles/sf-nodepool/templates/_nodepool.yaml.j2
index 40bd2d8fc..4495446ce 100644
--- a/ansible/roles/sf-nodepool/templates/_nodepool.yaml.j2
+++ b/ansible/roles/sf-nodepool/templates/_nodepool.yaml.j2
@@ -19,8 +19,10 @@ cron:
   check: '*/15 * * * *'
 
 targets:
+{% if 'zuul-launcher' in roles and nodepool_zuul_launcher_target|default(True) %}
   - name: zuul
     assign-via-gearman: True
+{% endif %}
 {% if 'jenkins' in roles %}
   - name: default
 {% endif %}
diff --git a/ansible/roles/sf-zuul/templates/zuul.conf.j2 b/ansible/roles/sf-zuul/templates/zuul.conf.j2
index 1cf79bb1d..f3799acdd 100644
--- a/ansible/roles/sf-zuul/templates/zuul.conf.j2
+++ b/ansible/roles/sf-zuul/templates/zuul.conf.j2
@@ -1,6 +1,6 @@
 [gearman]
 server={{ zuul_server_host }}
-check_job_registration=true
+check_job_registration=false
 
 [gearman_server]
 start=true