ansible: Refactor jenkins master role

- Spacing/tabs/syntax/quoting
- Updated for compatibility with ansible > v2
- Only support Ubuntu Xenial for now

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

diff --git a/ansible/examples/master.yml b/ansible/examples/master.yml
index cd2a082e2dc1d086b067945d60dc2b5335422485..6f3a792f8bbd975aa5caf24669fa1ce67a31d5cc 100644 (file)
--- a/ansible/examples/master.yml
+++ b/ansible/examples/master.yml
@@ -1,8 +1,8 @@
 ---
 
-- hosts: jenkins
-  user: admin
-  sudo: true
+- hosts: jenkins_master
+  user: cm
+  become: true
   roles:
     - ansible-jenkins
   vars:

diff --git a/ansible/roles/ansible-jenkins/handlers/main.yml b/ansible/roles/ansible-jenkins/handlers/main.yml
index 728f7189207c467715a4282bbc4bfbd48f680248..6ea5b8f3de8cfeaec916268d9fc9f19b873d8af9 100644 (file)
--- a/ansible/roles/ansible-jenkins/handlers/main.yml
+++ b/ansible/roles/ansible-jenkins/handlers/main.yml
@@ -1,9 +1,8 @@
 # Safe-restart Jenkins
 - name: restart jenkins
-  sudo: yes
   command: java -jar {{ jenkins.cli_dest }} -s http://localhost:{{ port }} safe-restart
 
 - name: restart nginx
-  sudo: yes
-  action: service name=nginx state=restarted
-  #command: service nginx restart
+  service:
+    name: nginx
+    state: restarted

diff --git a/ansible/roles/ansible-jenkins/tasks/config.yml b/ansible/roles/ansible-jenkins/tasks/config.yml
index 16d26b78f1eaaab105cc67d7649a6d17386292da..efdc8fad46949fb4dd93c555ada17df18b9d1ead 100644 (file)
--- a/ansible/roles/ansible-jenkins/tasks/config.yml
+++ b/ansible/roles/ansible-jenkins/tasks/config.yml
@@ -52,18 +52,14 @@
     group: jenkins
     mode: 0644
 
-- name: Tell SELinux that we should allow Nginx to talk to Jenkins
-  seboolean: name=httpd_can_network_connect state=yes persistent=yes
-  when: ansible_pkg_mgr  == "yum"
-
-- name: copy JJB config file to {{ jenkins_jobs }}
+- name: "copy JJB config file to {{ jenkins_jobs }}"
   synchronize:
     src: jobs/jenkins-job-builder
     dest: '{{ jenkins_jobs }}'
     owner: no
     group: no
 
-- name: ensure correct ownership of {{ jenkins_jobs }}
+- name: "ensure correct ownership of {{ jenkins_jobs }}"
   file:
     path: '{{ jenkins_jobs }}'
     state: directory

diff --git a/ansible/roles/ansible-jenkins/tasks/dependencies.yml b/ansible/roles/ansible-jenkins/tasks/dependencies.yml
index 3f29e74c32411a1103d5f75f3ab848cca80e0466..a98bade7287a6470463f196f03b593037ac0bb15 100644 (file)
--- a/ansible/roles/ansible-jenkins/tasks/dependencies.yml
+++ b/ansible/roles/ansible-jenkins/tasks/dependencies.yml
@@ -1,16 +1,6 @@
 ---
-
-- name: epel-release install
-  yum: name=epel-release
-       state=present
-  when: ansible_pkg_mgr  == "yum"
-
-- name: Install RPM dependencies
-  yum: name={{ item }} state=installed
-  with_items: jenkins.{{ ansible_pkg_mgr }}.dependencies
-  when: ansible_pkg_mgr  == "yum"
-
 - name: Install DEB dependencies
-  apt: name={{ item }} state=installed
-  with_items: jenkins.{{ ansible_pkg_mgr }}.dependencies
-  when: ansible_pkg_mgr  == "apt"
+  apt:
+    name: "{{ item }}"
+    state: installed
+  with_items: "{{ jenkins.dependencies }}"

diff --git a/ansible/roles/ansible-jenkins/tasks/jenkins.yml b/ansible/roles/ansible-jenkins/tasks/jenkins.yml
index f94d7ea23ebc24c85e8f9fc11da55342ce7efb28..20e3f59394d0515626ca6ee80899183689194050 100644 (file)
--- a/ansible/roles/ansible-jenkins/tasks/jenkins.yml
+++ b/ansible/roles/ansible-jenkins/tasks/jenkins.yml
@@ -5,15 +5,11 @@
 
 - include: nginx.yml
 
-- name: Install Jenkins with Yum
-  yum: name=jenkins state=present
+- name: Install Jenkins
+  apt:
+    name: jenkins
+    state: present
   register: jenkins_install
-  when: ansible_pkg_mgr  == "yum"
-
-- name: Install Jenkins with Apt
-  apt: name=jenkins state=present
-  register: jenkins_install
-  when: ansible_pkg_mgr  == "apt"
 
 - include: config.yml
 

diff --git a/ansible/roles/ansible-jenkins/tasks/nginx.yml b/ansible/roles/ansible-jenkins/tasks/nginx.yml
index 14f092ed57634a4f67eb4e0116905fbd81c29761..7fcf97604f4a892d73aaed66bb4b1bd09893522e 100644 (file)
--- a/ansible/roles/ansible-jenkins/tasks/nginx.yml
+++ b/ansible/roles/ansible-jenkins/tasks/nginx.yml
@@ -1,16 +1,24 @@
 ---
 
   - name: ensure sites-available for nginx
-    file: path=/etc/nginx/sites-available state=directory
+    file:
+      path: /etc/nginx/sites-available
+      state: directory
 
   - name: ensure sites-enable for nginx
-    file: path=/etc/nginx/sites-enabled state=directory
+    file:
+      path: /etc/nginx/sites-enabled
+      state: directory
 
   - name: remove default nginx site
-    action: file path=/etc/nginx/sites-enabled/default state=absent
+    file:
+      path: /etc/nginx/sites-enabled/default
+      state: absent
 
   - name: write nginx.conf
-    action: template src=../templates/nginx.conf dest=/etc/nginx/nginx.conf
+    template:
+      src: templates/nginx.conf
+      dest: /etc/nginx/nginx.conf
 
   - name: write jenkins SSL public cert
     copy:
@@ -22,12 +30,20 @@
     when: ansible_pkg_mgr  == 'apt'
 
   - name: create nginx site config
-    action: template src=../templates/jenkins.conf dest=/etc/nginx/sites-available/jenkins.conf
+    template:
+      src: templates/jenkins.conf
+      dest: /etc/nginx/sites-available/jenkins.conf
     notify:
       - restart nginx
 
   - name: link nginx config
-    action: file src=/etc/nginx/sites-available/jenkins.conf dest=/etc/nginx/sites-enabled/jenkins.conf state=link
+    file:
+      src: /etc/nginx/sites-available/jenkins.conf
+      dest: /etc/nginx/sites-enabled/jenkins.conf
+      state: link
 
   - name: Enable Nginx service
-    service: name=nginx enabled=yes state=started
+    service:
+      name: nginx
+      enabled: yes
+      state: started

diff --git a/ansible/roles/ansible-jenkins/tasks/repo.yml b/ansible/roles/ansible-jenkins/tasks/repo.yml
index 5ee036c69da9f67a606f82ca6b55f1a66e7be9cd..5b17792cffdaaf5529e71b3c9ac37cc6ace679bd 100644 (file)
--- a/ansible/roles/ansible-jenkins/tasks/repo.yml
+++ b/ansible/roles/ansible-jenkins/tasks/repo.yml
@@ -1,38 +1,11 @@
 ---
-
-# Yum
-
-- name: Install python-devel
-  yum: name=python-devel state=present
-  when: ansible_pkg_mgr  == "yum"
-
-- name: Install python-pycurl
-  yum: name=python-pycurl state=present
-  when: ansible_pkg_mgr  == "yum"
-
-- name: Add Jenkins GPG Key
-  rpm_key: state=present key=https://jenkins-ci.org/redhat/jenkins-ci.org.key
-  when: ansible_pkg_mgr  == "yum"
-
-- name: Create the repo file for Jenkins
-  copy: src=jenkins.repo
-        dest=/etc/yum.repos.d/
-        owner=root
-        group=root
-        mode=0644
-  when: ansible_pkg_mgr  == "yum"
-
-# Apt
-
 - name: Add Jenkins GPG Key
   apt_key:
     url: "https://jenkins-ci.org/debian/jenkins-ci.org.key"
     state: present
-  when: ansible_pkg_mgr  == "apt"
 
 - name: Add the jenkins repo
   apt_repository:
     repo: 'deb http://pkg.jenkins-ci.org/debian binary/'
     state: present
     update_cache: true
-  when: ansible_pkg_mgr  == "apt"

diff --git a/ansible/roles/ansible-jenkins/vars/main.yml b/ansible/roles/ansible-jenkins/vars/main.yml
index 9f409225b65dc1fdefa29bbf992274124f2c6ded..5f975fd1e6cd6cb715955a97b426f98e14ef5f6d 100644 (file)
--- a/ansible/roles/ansible-jenkins/vars/main.yml
+++ b/ansible/roles/ansible-jenkins/vars/main.yml
@@ -3,20 +3,11 @@ jenkins_dest: /opt/jenkins
 jenkins_lib: /var/lib/jenkins
 jenkins_jobs: '{{ jenkins_lib }}/jobs'
 jenkins:
-  yum:
-    #repo: 'deb http://pkg.jenkins-ci.org/debian binary/' # Jenkins repository
-    dependencies: # Jenkins dependencies
-      #- 'openjdk-7-jre'
-      - 'java-1.7.0-openjdk'
-      - 'git'
-      - 'curl'
-      - 'nginx'
-    config_file: '/etc/sysconfig/jenkins'
-  apt:
-    dependencies: # Jenkins dependencies
-      - 'git'
-      - 'curl'
-      - 'nginx'
-    config_file: '/etc/default/jenkins'
+  dependencies: # Jenkins dependencies
+    - 'git'
+    - 'curl'
+    - 'nginx'
+    - 'default-jdk'
+  config_file: '/etc/default/jenkins'
   cli_dest: '{{ jenkins_dest }}/jenkins-cli.jar' # Jenkins CLI destination
   updates_dest: '{{ jenkins_dest }}/updates_jenkins.json' # Jenkins updates file