diff --git a/tasks/plugins.yml b/tasks/plugins.yml index dbc2a2da..e2ea0ef4 100644 --- a/tasks/plugins.yml +++ b/tasks/plugins.yml @@ -5,7 +5,7 @@ src: "{{ jenkins_admin_password_file }}" register: adminpasswordfile no_log: true - when: jenkins_admin_password_file | default(false) + when: jenkins_admin_password_file is defined and jenkins_admin_password_file != "" tags: ['skip_ansible_lint'] - name: Set Jenkins admin password fact. @@ -54,7 +54,7 @@ url: "http://{{ jenkins_hostname }}:{{ jenkins_http_port }}{{ jenkins_url_prefix }}" with_dependencies: "{{ jenkins_plugins_install_dependencies }}" with_items: "{{ jenkins_plugins }}" - when: jenkins_admin_password | default(false) + when: jenkins_admin_password is defined and jenkins_admin_password != "" notify: restart jenkins tags: ['skip_ansible_lint'] register: plugin_result diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index 07552ab9..0d0dde66 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -19,7 +19,7 @@ repo: "{{ jenkins_repo_url }}" state: present update_cache: true - when: jenkins_repo_url | default(false) + when: jenkins_repo_url is defined and jenkins_repo_url != "" tags: ['skip_ansible_lint'] - name: Download specific Jenkins version. diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml index 22c9e6dc..31814349 100644 --- a/tasks/setup-RedHat.yml +++ b/tasks/setup-RedHat.yml @@ -12,13 +12,13 @@ get_url: url: "{{ jenkins_repo_url }}" dest: /etc/yum.repos.d/jenkins.repo - when: jenkins_repo_url | default(false) + when: jenkins_repo_url is defined and jenkins_repo_url != "" - name: Add Jenkins repo GPG key. rpm_key: state: present key: "{{ jenkins_repo_key_url }}" - when: jenkins_repo_url | default(false) + when: jenkins_repo_url is defined and jenkins_repo_url != "" - name: Download specific Jenkins version. get_url: