From: David Galloway <dgallowa@redhat.com>
Date: Fri, 4 Aug 2017 19:48:58 +0000 (-0400)
Subject: ansible: Add warning about restarting Jenkins to playbook
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=605d891eb7b4e8003a3ca3e61f359a263f5fa7fe;p=ceph-build.git

ansible: Add warning about restarting Jenkins to playbook

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/ansible/examples/master.yml b/ansible/examples/master.yml
index 6216f9a8..7be881ae 100644
--- a/ansible/examples/master.yml
+++ b/ansible/examples/master.yml
@@ -44,3 +44,7 @@
     #  smtp_host: 'mail.example.com'
     #  smtp_ssl: 'true'
     #  default_email_suffix: '@example.com'
+  vars_prompt:
+  - name: "okay_with_restart"
+    prompt: "\nWARNING: Some tasks like updating/installing plugins will restart Jenkins.\nAre you okay with restarting the Jenkins service? (y|n)"
+    default: "n"
diff --git a/ansible/roles/ansible-jenkins/handlers/main.yml b/ansible/roles/ansible-jenkins/handlers/main.yml
index 1b67b768..0e1d688a 100644
--- a/ansible/roles/ansible-jenkins/handlers/main.yml
+++ b/ansible/roles/ansible-jenkins/handlers/main.yml
@@ -1,6 +1,7 @@
 # Safe-restart Jenkins
 - name: restart jenkins
   command: java -jar {{ jenkins.cli_dest }} -s http://localhost:{{ jenkins_port }} safe-restart
+  when: okay_with_restart == "y"
 
 - name: restart nginx
   service:
diff --git a/ansible/roles/ansible-jenkins/tasks/jenkins.yml b/ansible/roles/ansible-jenkins/tasks/jenkins.yml
index 90e18c88..9c49199e 100644
--- a/ansible/roles/ansible-jenkins/tasks/jenkins.yml
+++ b/ansible/roles/ansible-jenkins/tasks/jenkins.yml
@@ -22,6 +22,7 @@
 - include: config.yml
 
 - include: plugins.yml
+  when: okay_with_restart == "y"
   tags:
     - plugins