revisit docker support

Author: brianshumate

CHANGELOG.md

@@ -66,3 +66,8 @@
 
 - Remove deprecated tasks
 - Add conditionals to tasks
+
+## v1.2.0
+
+- Dropping native Docker subsystem support in favor of external role
+- Attempting to run nomad as nomad user

tasks/CentOS.yml

@@ -35,15 +35,15 @@
 
 - name: Add Docker repo
   copy: src=../files/docker.repo dest=/etc/yum.repos.d/docker.repo owner=root group=root mode=0644
-  when: nomad_enable_docker == "true"
+  when: nomad_enable_docker == "native"
   tags: docker
 
 - name: Install Docker
   yum: name=docker-engine state=latest
-  when: nomad_enable_docker == "true"
+  when: nomad_enable_docker == "native"
   tags: docker
 
 - name: Start Docker
   service: name=docker enabled=yes state=started
-  when: nomad_enable_docker == "true"
+  when: nomad_enable_docker == "native"
   tags: docker

tasks/Debian.yml

@@ -35,24 +35,24 @@
 
 - name: Update package cache
   apt: update_cache=yes
-  when: nomad_enable_docker == "true"
+  when: nomad_enable_docker == "native"
   tags: docker
 
 - name: Apt transport package
   apt: name='apt-transport-https' state=present
-  when: nomad_enable_docker == "true"
+  when: nomad_enable_docker == "native"
   tags: docker
 
 - name: CA certs package
   apt: name='ca-certificates' state=present
-  when: nomad_enable_docker == "true"
+  when: nomad_enable_docker == "native"
   tags: docker
 
 - name: HTTPS APT transport for Docker repository
   apt:
     name: apt-transport-https
     state: present
-  when: nomad_enable_docker == "true"
+  when: nomad_enable_docker == "native"
   tags: docker
 
 - name: Add Docker signing key
@@ -61,7 +61,7 @@
     keyserver: "{{ nomad_apt_key_url }}"
     state: present
   register: add_repository_key
-  when: nomad_enable_docker == "true"
+  when: nomad_enable_docker == "native"
   tags: docker
 
 - name: Add Docker repo and update apt cache
@@ -70,15 +70,15 @@
     mode: '644'
     update_cache: yes
     state: present
-  when: nomad_enable_docker == "true"
+  when: nomad_enable_docker == "native"
   tags: docker
 
 - name: Install Docker
   apt: name='docker-engine' state=present update_cache=yes
-  when: nomad_enable_docker == "true"
+  when: nomad_enable_docker == "native"
   tags: docker
 
 - name: Start Docker
   service: name=docker enabled=yes state=started
-  when: nomad_enable_docker == "true"
+  when: nomad_enable_docker == "native"
   tags: docker

tasks/RedHat.yml

@@ -37,15 +37,15 @@
 
 - name: Add Docker repo
   copy: src=../files/docker.repo dest=/etc/yum.repos.d/docker.repo owner=root group=root mode=0644
-  when: nomad_enable_docker == "true"
+  when: nomad_enable_docker == "native"
   tags: docker
 
 - name: Install Docker
   yum: name=docker-engine state=latest
-  when: nomad_enable_docker == "true"
+  when: nomad_enable_docker == "native"
   tags: docker
 
 - name: Start Docker
   service: name=docker enabled=yes state=started
-  when: nomad_enable_docker == "true"
+  when: nomad_enable_docker == "native"
   tags: docker

tasks/Ubuntu.yml

@@ -41,7 +41,7 @@
     update_cache: yes
     cache_valid_time: 600
   register: dmsetup_result
-  when: ansible_distribution_version|version_compare(16.04, '=') and nomad_enable_docker == "true"
+  when: ansible_distribution_version|version_compare(16.04, '=') and nomad_enable_docker == "native"
   tags: docker
 
 - name: Run dmsetup for Ubuntu 16.04
@@ -50,24 +50,24 @@
   tags: docker 
 - name: Update package cache
   apt: update_cache=yes
-  when: nomad_enable_docker == "true"
+  when: nomad_enable_docker == "native"
   tags: docker
 
 - name: Apt transport package
   apt: name='apt-transport-https' state=present
-  when: nomad_enable_docker == "true"
+  when: nomad_enable_docker == "native"
   tags: docker
 
 - name: CA certs package
   apt: name='ca-certificates' state=present
-  when: nomad_enable_docker == "true"
+  when: nomad_enable_docker == "native"
   tags: docker
 
 - name: HTTPS APT transport for Docker repository
   apt:
     name: apt-transport-https
     state: present
-  when: nomad_enable_docker == "true"
+  when: nomad_enable_docker == "native"
   tags: docker
 
 - name: Add Docker signing key
@@ -85,16 +85,16 @@
     mode: '644'
     update_cache: yes
     state: present
-  when: nomad_enable_docker == "true"
+  when: nomad_enable_docker == "native"
   tags: docker
 
 - name: Install Docker
   apt: name='docker-engine' state=present update_cache=yes
-  when: nomad_enable_docker == "true"
+  when: nomad_enable_docker == "native"
   tags: docker
 
 - name: Start Docker
   service: name=docker enabled=yes state=started
-  when: nomad_enable_docker == "true"
+  when: nomad_enable_docker == "native"
   tags: docker
 

tasks/main.yml

@@ -19,6 +19,10 @@
 - name: "Add nomad user"
   user: name=nomad comment="nomad user" uid=1047 group=bin
 
+- name: "Add nomad user to docker group"
+  user: name=nomad groups=docker append=yes
+  when: nomad_enable_docker == "true"
+
 - name: "CentOS tasks"
   include: CentOS.yml
   when: ansible_distribution  == "CentOS"

templates/nomad_systemd.service.j2

@@ -14,9 +14,8 @@ Wants=basic.target
 After=basic.target network.target
 
 [Service]
-# FIXME: this does not work atm
-# User={{ nomad_user }}
-# Group={{ nomad_group }}
+User={{ nomad_user }}
+Group={{ nomad_group }}
 
 ExecStart=/usr/local/bin/nomad agent -server \
     -config=/etc/nomad.d/{{ nomad_node_role }}

version.txt

@@ -1 +1 @@
-v1.1.9
+v1.2.0