Consistency changes:

* Ansible 2 fixes
* Add support for Ubuntu 16.04

Author: tersmitten

Vagrantfile

@@ -4,14 +4,6 @@
 role = File.basename(File.expand_path(File.dirname(__FILE__)))
 
 boxes = [
-  {
-    :name => "ubuntu-1004",
-    :box => "opscode-ubuntu-10.04",
-    :url => "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-10.04_chef-provisionerless.box",
-    :ip => '10.0.0.10',
-    :cpu => "50",
-    :ram => "256"
-   },
   {
     :name => "ubuntu-1204",
     :box => "opscode-ubuntu-12.04",
@@ -29,9 +21,9 @@ boxes = [
     :ram => "256"
   },
   {
-    :name => "debian-6010",
-    :box => "opscode-debian-6.0.10",
-    :url => "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10_chef-provisionerless.box",
+    :name => "ubuntu-1604",
+    :box => "opscode-ubuntu-16.04",
+    :url => "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-16.04_chef-provisionerless.box",
     :ip => '10.0.0.13',
     :cpu => "50",
     :ram => "256"

meta/main.yml

@@ -7,16 +7,15 @@ galaxy_info:
   license: MIT
   min_ansible_version: 1.6
   platforms:
-  - name: Ubuntu
-    versions:
-    - lucid
-    - precise
-    - trusty
-  - name: Debian
-    versions:
-    - squeeze
-    - wheezy
-    - jessie
+    - name: Ubuntu
+      versions:
+        - precise
+        - trusty
+        - xenial
+    - name: Debian
+      versions:
+        - wheezy
+        - jessie
   galaxy_tags:
   - system
   - networking

tasks/authorized-keys.yml

@@ -5,5 +5,6 @@
     user: "{{ item.owner }}"
     key: "{{ lookup('file', item.src) }}"
     state: "{{ item.state | default('present') }}"
-  with_items: ssh_keys_authorized_keys
-  tags: [configuration, ssh-keys, ssh-keys-authorized-keys]
+  with_items: "{{ ssh_keys_authorized_keys }}"
+  tags:
+    ssh-keys-authorized-keys-setup

tasks/general.yml

@@ -7,8 +7,10 @@
     owner: "{{ item.owner }}"
     group: "{{ item.group | default(item.owner) }}"
     mode: 0700
-  with_items: ssh_keys_private_keys
-  tags: [configuration, ssh-keys]
+  with_items: "{{ ssh_keys_private_keys }}"
+  tags:
+    - ssh-keys-general-create-ssh-directories
+    - ssh-keys-general-create-ssh-directories-private-keys
 
 - name: create ssh directory
   file:
@@ -17,5 +19,7 @@
     owner: "{{ item.owner }}"
     group: "{{ item.group | default(item.owner) }}"
     mode: 0700
-  with_items: ssh_keys_public_keys
-  tags: [configuration, ssh-keys]
+  with_items: "{{ ssh_keys_public_keys }}"
+  tags:
+    - ssh-keys-general-create-ssh-directories
+    - ssh-keys-general-create-ssh-directories-public-keys

tasks/known-hosts.yml

@@ -7,4 +7,5 @@
     owner: root
     group: root
     mode: 0644
-  tags: [configuration, ssh-keys, ssh-keys-known-hosts]
+  tags:
+    ssh-keys-known-hosts-update

tasks/main.yml

@@ -1,7 +1,31 @@
 # tasks file for ssh-keys
 ---
 - include: general.yml
+  tags:
+    - configuration
+    - ssh-keys
+    - ssh-keys-general
+
 - include: private-keys.yml
+  tags:
+    - configuration
+    - ssh-keys
+    - ssh-keys-private-keys
+
 - include: public-keys.yml
+  tags:
+    - configuration
+    - ssh-keys
+    - ssh-keys-public-keys
+
 - include: authorized-keys.yml
+  tags:
+    - configuration
+    - ssh-keys
+    - ssh-keys-authorized-keys
+
 - include: known-hosts.yml
+  tags:
+    - configuration
+    - ssh-keys
+    - ssh-keys-known-hosts

tasks/private-keys.yml

@@ -7,14 +7,16 @@
     owner: "{{ item.owner }}"
     group: "{{ item.group | default(item.owner) }}"
     mode: "{{ item.mode | default('0600') }}"
-  with_items: ssh_keys_private_keys
+  with_items: "{{ ssh_keys_private_keys }}"
   when: item.state is undefined or item.state == 'present'
-  tags: [configuration, ssh-keys, ssh-keys-private-keys]
+  tags:
+    - ssh-keys-private-keys-add
 
 - name: remove private keys
   file:
     path: "~{{ item.owner }}/{{ ssh_keys_sshdir }}/{{ item.dest | default(ssh_keys_private_key_filename) }}"
     state: absent
-  with_items: ssh_keys_private_keys
+  with_items: "{{ ssh_keys_private_keys }}"
   when: item.state is defined and item.state == 'absent'
-  tags: [configuration, ssh-keys, ssh-keys-private-keys]
+  tags:
+    - ssh-keys-private-keys-remove

tasks/public-keys.yml

@@ -7,14 +7,16 @@
     owner: "{{ item.owner }}"
     group: "{{ item.group | default(item.owner) }}"
     mode: "{{ item.mode | default('0644') }}"
-  with_items: ssh_keys_public_keys
+  with_items: "{{ ssh_keys_public_keys }}"
   when: item.state is undefined or item.state == 'present'
-  tags: [configuration, ssh-keys, ssh-keys-public-keys]
+  tags:
+    - ssh-keys-public-keys-add
 
 - name: remove public keys
   file:
     path: "~{{ item.owner }}/{{ ssh_keys_sshdir }}/{{ item.dest | default(ssh_keys_public_key_filename) }}"
     state: absent
-  with_items: ssh_keys_public_keys
+  with_items: "{{ ssh_keys_public_keys }}"
   when: item.state is defined and item.state == 'absent'
-  tags: [configuration, ssh-keys, ssh-keys-public-keys]
+  tags:
+    - ssh-keys-public-keys-remove