Package and task updates.

- Update OS packages
- Update signing key tasks

Author: brianshumate

CHANGELOG.md

@@ -46,3 +46,8 @@
 ## v1.1.5
 
 - Keyserver quoting
+
+## v1.1.6
+
+- Update OS packages
+- Update signing key tasks

defaults/main.yml

@@ -17,6 +17,9 @@ nomad_syslog_enable: "true"
 nomad_iface: "eth1"
 nomad_bind_address: "{{ hostvars[inventory_hostname]['ansible_eth1']['ipv4']['address'] }}"
 nomad_enable_docker: "false"
+nomad_apt_key_url: "hkp://p80.pool.sks-keyservers.net:80"
+nomad_apt_key_sig: 58118E89F3A912897C070ADBF76221572C52609D
+nomad_apt_repo: deb https://apt.dockerproject.org/repo {{ ansible_lsb.id|lower }}-{{ ansible_lsb.codename|lower }} main
 
 ## Package vars
 
@@ -26,6 +29,7 @@ nomad_centos_sha256: "{{ nomad_zip_sha256 }}"
 
 nomad_centos_os_packages:
   - libselinux-python
+  - curl
   - git
   - unzip
 
@@ -34,6 +38,7 @@ nomad_debian_url: "{{ nomad_zip_url }}"
 nomad_debian_sha256: "{{ nomad_zip_sha256 }}"
 nomad_docker_debian_repo: "deb https://apt.dockerproject.org/repo debian-jessie main"
 nomad_debian_os_packages:
+  - curl
   - git
   - unzip
 
@@ -43,6 +48,7 @@ nomad_redhat_sha256: "{{ nomad_zip_sha256 }}"
 
 nomad_redhat_os_packages:
   - libselinux-python
+  - curl
   - git
   - unzip
 
@@ -52,4 +58,5 @@ nomad_ubuntu_sha256: "{{ nomad_zip_sha256 }}"
 nomad_docker_ubuntu_repo: "deb https://apt.dockerproject.org/repo ubuntu-xenial main"
 nomad_ubuntu_os_packages:
   - git
+  - curl
   - unzip

tasks/Debian.yml

@@ -48,24 +48,37 @@
   when: nomad_enable_docker == "true"
   tags: docker
 
-- name: Signing key
-  apt_key: "keyserver=p80.pool.sks-keyservers.net id=58118E89F3A912897C070ADBF76221572C52609D"
+- name: HTTPS APT transport for Docker repository
+  apt:
+    name: apt-transport-https
+    state: present
   when: nomad_enable_docker == "true"
   tags: docker
 
-- name: Add Docker repo
-  apt_repository: "repo={{ nomad_docker_debian_repo }} state=present"
+- name: Add Docker signing key
+  apt_key:
+    id: "{{ nomad_apt_key_sig }}"
+    keyserver: "{{ nomad_apt_key_url }}"
+    state: present
+  register: add_repository_key
+  ignore_errors: true
+  tags: docker
+
+- name: Add Docker repo and update apt cache
+  apt_repository:
+    repo: "{{ nomad_apt_repo }}"
+    mode: '644'
+    update_cache: yes
+    state: present
   when: nomad_enable_docker == "true"
   tags: docker
 
 - name: Install Docker
   apt: name='docker-engine' state=present update_cache=yes
   when: nomad_enable_docker == "true"
-  tags: docker 
+  tags: docker
 
 - name: Start Docker
   service: name=docker enabled=yes state=started
   when: nomad_enable_docker == "true"
   tags: docker
-
-  

tasks/Ubuntu.yml

@@ -33,6 +33,21 @@
 
 ## Docker Subsystem
 
+# Fix for https://github.com/docker/docker/issues/23347
+- name: Install dmsetup for Ubuntu 16.04
+  apt:
+    pkg: dmsetup
+    state: "{{ dmsetup_pkg_state }}"
+    update_cache: yes
+    cache_valid_time: 600
+  register: dmsetup_result
+  when: ansible_distribution_version|version_compare(16.04, '=') and nomad_enable_docker == "true"
+  tags: docker
+
+- name: Run dmsetup for Ubuntu 16.04
+  command: dmsetup mknodes
+  when: dmsetup_result and 
+  tags: docker 
 - name: Update package cache
   apt: update_cache=yes
   when: nomad_enable_docker == "true"
@@ -48,20 +63,35 @@
   when: nomad_enable_docker == "true"
   tags: docker
 
-- name: Signing key
-  apt_key: "keyserver=p80.pool.sks-keyservers.net id=58118E89F3A912897C070ADBF76221572C52609D"
+- name: HTTPS APT transport for Docker repository
+  apt:
+    name: apt-transport-https
+    state: present
   when: nomad_enable_docker == "true"
   tags: docker
 
-- name: Add Docker repo
-  apt_repository: "repo={{ nomad_docker_ubuntu_repo }} state=present"
+- name: Add Docker signing key
+  apt_key:
+    id: "{{ nomad_apt_key_sig }}"
+    keyserver: "{{ nomad_apt_key_url }}"
+    state: present
+  register: add_repository_key
+  ignore_errors: true
+  tags: docker
+
+- name: Add Docker repo and update apt cache
+  apt_repository:
+    repo: "{{ nomad_apt_repo }}"
+    mode: '644'
+    update_cache: yes
+    state: present
   when: nomad_enable_docker == "true"
   tags: docker
 
 - name: Install Docker
   apt: name='docker-engine' state=present update_cache=yes
   when: nomad_enable_docker == "true"
-  tags: docker 
+  tags: docker
 
 - name: Start Docker
   service: name=docker enabled=yes state=started

tasks/main.yml

@@ -1,6 +1,16 @@
 ---
 # File: tasks/main.yml - Main tasks for nomad
 
+- name: Fail if not a new release of Ubuntu
+  fail:
+    msg: "{{ ansible_distribution_version }} is not an acceptable version of Ubuntu for this role"
+  when: ansible_lsb.id|lower == "ubuntu" and ( ansible_distribution_version|version_compare(12.04, '<') or ansible_distribution_version|version_compare(12.10, '=') )
+
+- name: Fail if not a new release of Debian
+  fail:
+    msg: "{{ ansible_distribution_version }} is not an acceptable version of Debian for this role"
+  when: ansible_lsb.id|lower == "debian" and ansible_distribution_version|version_compare(8.5, '<')
+
 - name: Create cluster groupings
   group_by: key={{ nomad_node_role }}
 

version.txt

@@ -1 +1 @@
-v1.1.5
+v1.1.6