Merge branch 'devel'

Author: brianshumate

CHANGELOG.md

@@ -147,3 +147,9 @@
 ## v1.5.0
 
 - Version fix
+
+## v1.5.1
+
+- Enable the service when starting
+- Prefer compact YAML in tasks
+- Task cleanup

handlers/main.yml

@@ -1,2 +1,2 @@
 ---
-# handlers file for nomad
+# File: main.yml handlers file for nomad

meta/main.yml

@@ -2,133 +2,27 @@
 galaxy_info:
   author: Brian Shumate
   description: Nomad cluster role
-  company: your company (optional)
-  # If the issue tracker for your role is not on github, uncomment the
-  # next line and provide a value
-  # issue_tracker_url: http://example.com/issue/tracker
-  # Some suggested licenses:
-  # - BSD (default)
-  # - MIT
-  # - GPLv2
-  # - GPLv3
-  # - Apache
-  # - CC-BY
-  license: license BSD
-  min_ansible_version: 1.9
-  #
-  # Below are all platforms currently available. Just uncomment
-  # the ones that apply to your role. If you don't see your 
-  # platform on this list, let us know and we'll get it added!
-  #
+  company:
+  license: BSD
+  min_ansible_version: 2.1.0.0
   platforms:
   - name: EL
     versions:
-  #  - all
-  #  - 5
     - 6
     - 7
-  #- name: GenericUNIX
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Fedora
-  #  versions:
-  #  - all
-  #  - 16
-  #  - 17
-  #  - 18
-  #  - 19
-  #  - 20
-  #  - 21
-  #  - 22
-  #- name: SmartOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: opensuse
-  #  versions:
-  #  - all
-  #  - 12.1
-  #  - 12.2
-  #  - 12.3
-  #  - 13.1
-  #  - 13.2
-  #- name: Amazon
-  #  versions:
-  #  - all
-  #  - 2013.03
-  #  - 2013.09
-  #- name: GenericBSD
-  #  versions:
-  #  - all
-  #  - any
   #- name: FreeBSD
   #  versions:
-  #  - all
-  #  - 8.0
-  #  - 8.1
-  #  - 8.2
-  #  - 8.3
-  #  - 8.4
-  #  - 9.0
-  #  - 9.1
-  #  - 9.1
-  #  - 9.2
+  #  - 11.0
   - name: Ubuntu
     versions:
-  #  - all
-  #  - lucid
-  #  - maverick
-  #  - natty
-  #  - oneiric
-  #  - precise
-  #  - quantal
-  #  - raring
-  #  - saucy
-    - trusty
-  #  - utopic
-  #  - vivid
-  #- name: SLES
-  #  versions:
-  #  - all
-  #  - 10SP3
-  #  - 10SP4
-  #  - 11
-  #  - 11SP1
-  #  - 11SP2
-  #  - 11SP3
-  #- name: GenericLinux
-  #  versions:
-  #  - all
-  #  - any
+    - xenial
   - name: Debian
     versions:
-  #  - all
-  #  - etch
     - jessie
-  #  - lenny
-  #  - squeeze
-  #  - wheezy
-  #
-  # Below are all categories currently available. Just as with
-  # the platforms above, uncomment those that apply to your role.
-  #
   galaxy_tags:
-  #- cloud
-  #- cloud:ec2
-  #- cloud:gce
-  #- cloud:rax
+  - cloud
   - clustering
-  #- database
-  #- database:nosql
-  #- database:sql
-  #- development
-  #- monitoring
   - networking
-  #- packaging
+  - scheduling
   - system
-  #- web
 dependencies: []
-  # List your role dependencies here, one per line.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.

tasks/docker.yml

@@ -16,5 +16,5 @@
 
 - name: Run dmsetup for Ubuntu 16.04
   command: dmsetup mknodes
-  when: dmsetup_result 
-  tags: docker 
+  when: dmsetup_result
+  tags: docker

tasks/main.yml

@@ -1,5 +1,5 @@
 ---
-# File: tasks/main.yml - Main tasks for nomad
+# File: tasks/main.yml - Main tasks for Nomad
 
 - name: Check distribution compatibility
   fail:
@@ -8,73 +8,111 @@
 
 - name: Fail if not a new release of Red Hat / CentOS
   fail:
-    msg: "{{ ansible_distribution_version }} is not an acceptable version of {{ ansible_distribution }} for this role"
+    msg: "{{ ansible_distribution_version }} is not a supported version of {{ ansible_distribution }} for this role"
   when: ansible_distribution in ['RedHat', 'CentOS'] and ansible_distribution_version|version_compare(6, '<')
 
 - name: Fail if not a new release of Debian
   fail:
-    msg: "{{ ansible_distribution_version }} is not an acceptable version of {{ ansible_distribution }} for this role"
+    msg: "{{ ansible_distribution_version }} is not a supported version of {{ ansible_distribution }} for this role"
   when: ansible_distribution == "Debian" and ansible_distribution_version|version_compare(8.5, '<')
 
 - name: Fail if not a new release of Ubuntu
   fail:
-    msg: "{{ ansible_distribution_version }} is not an acceptable version of {{ ansible_distribution }} for this role"
+    msg: "{{ ansible_distribution_version }} is not a supported version of {{ ansible_distribution }} for this role"
   when: ansible_distribution == "Ubuntu" and ansible_distribution_version|version_compare(13.04, '<')
 
 - name: Create cluster groupings
-  group_by: key={{ nomad_node_role }}
-
-- group_by: key=os_{{ ansible_os_family }}
-
-- 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
+  group_by:
+    key: "{{ nomad_node_role }}"
+
+- group_by:
+    key: "os_{{ ansible_os_family }}"
+
+- 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"
 
-# Include variables and define needed variables.
-- name: Include OS-specific variables.
+- name: Include OS variables
   include_vars: "{{ ansible_os_family }}.yml"
-  
-- name: Install specified packages  
+
+- name: Install OS packages
   include: install.yml
 
 - name: Disable SELinux (RHEL)
   include: selinux.yml
   when: ansible_os_family == "RedHat"
 
-- name: Directories
-  file: "dest={{ item }} state=directory owner={{ nomad_user }} group={{ nomad_group}}"
+- name: Create directories
+  file:
+    dest: "{{ item }}"
+    state: directory
+    owner: "{{ nomad_user }}"
+    group: "{{ nomad_group}}"
   with_items:
     - /opt/nomad
     - /var/nomad
     - /var/run/nomad
     - /etc/nomad.d
 
 - name: Base configuration
-  template: src=base.hcl.j2 dest={{ nomad_config_dir }}/base.hcl
+  template:
+    src: base.hcl.j2
+    dest: "{{ nomad_config_dir }}/base.hcl"
 
 - name: Bootstrap server configuration
-  template: src=bootstrap.hcl.j2 dest={{ nomad_config_dir }}/bootstrap.hcl
+  template:
+    src: bootstrap.hcl.j2
+    dest: "{{ nomad_config_dir }}/bootstrap.hcl"
 
 - name: Server configuration
-  template: src=server.hcl.j2 dest={{ nomad_config_dir }}/server.hcl
+  template:
+    src: server.hcl.j2
+    dest: "{{ nomad_config_dir }}/server.hcl"
 
 - name: Client configuration
-  template: src=client.hcl.j2 dest={{ nomad_config_dir }}/client.hcl
+  template:
+    src: client.hcl.j2
+    dest: "{{ nomad_config_dir }}/client.hcl"
 
 - name: SYSV init script
-  template: src=nomad_sysvinit.j2 dest=/etc/init.d/nomad owner=root group=root mode=755
+  template:
+    src: nomad_sysvinit.j2
+    dest: /etc/init.d/nomad
+    owner: root
+    group: root
+    mode: 0755
   when: not ansible_service_mgr == "systemd" and not ansible_os_family == "Debian"
 
 - name: Debian init script
-  template: src=nomad_debian.init.j2 dest=/etc/init.d/nomad owner=root group=root mode=755
+  template:
+    src: nomad_debian.init.j2
+    dest: /etc/init.d/nomad
+    owner: root
+    group: root
+    mode: 0755
   when: not ansible_service_mgr == "systemd" and ansible_os_family == "Debian"
 
 - name: systemd script
-  template: src=nomad_systemd.service.j2 dest=/lib/systemd/system/nomad.service owner=root group=root mode=644
+  template:
+    src: nomad_systemd.service.j2
+    dest: /lib/systemd/system/nomad.service
+    owner: root
+    group: root
+    mode: 644
   when: ansible_service_mgr == "systemd"
 
 - name: Start Nomad
-  service: name=nomad state=started
+  service:
+    name: nomad
+    enabled: yes
+    state: started

version.txt

@@ -1 +1 @@
-v1.5.0
+v1.5.1