Merge branch 'master' into changelog_update

Author: greg-hellings

CHANGELOG

@@ -1,6 +1,7 @@
 v 0.8.0 (6 Sep 2017)
 - Added support for upgrading to Jenkins 2 from Jenkins 1
 - Added support for installing pinned plugins from multiple update centers
+- Significant improvements to Groovy script error reporting
 - Added ability to configure multiple admin users (jenkins_admin_sids), and to
   configure users with CLI access independently of them being admins
   (jenkins_cli_users)

cinch/roles/jenkins_master/handlers/main.yml

@@ -11,6 +11,12 @@
     name: jenkins
     state: restarted
 
+- name: restart Jenkins during upgrade
+  service:
+    name: jenkins
+    state: restarted
+  when: jenkins_upgrade
+
 # Reload firewalld by running command, since the firewalld module doesn't
 # support the functionality to reload rules.
 - name: reload firewalld

cinch/roles/jenkins_master/tasks/install.yml

@@ -19,6 +19,7 @@
     - openssl-devel
     - libffi-devel
     - ansible
+  notify: restart Jenkins during upgrade
 
 - name: install additional packages
   package:

cinch/roles/jenkins_master/tasks/post_configure.yml

@@ -6,7 +6,7 @@
     user: "{{ jenkins_admin.nickname }}"
     password: "{{ admin_api_key | default('') }}"
   register: script_output
-  changed_when: "script_output.output.find('CHANGED') != -1"
+  changed_when: "(script_output.output|default('')).find('CHANGED') != -1"
   # Since the jenkins_script module doesn't support check_mode, we disable it
   # here so that we can handle check mode inside of the Groovy scripts.
   check_mode: false