Merge pull request #2 from Oefenweb/consistency-changes

Consistency changes
Oefenweb · Nov 10, 2016 · 434c60b · 434c60b
2 parents 5600e12 + 5eb0719
commit 434c60b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -4,13 +4,6 @@
 role = File.basename(File.expand_path(File.dirname(__FILE__)))
 
 boxes = [
-  {
-    :name => "ubuntu-1004",
-    :box => "bento/ubuntu-10.04",
-    :ip => '10.0.0.10',
-    :cpu => "50",
-    :ram => "256"
-   },
   {
     :name => "ubuntu-1204",
     :box => "bento/ubuntu-12.04",
@@ -26,8 +19,8 @@ boxes = [
     :ram => "256"
   },
   {
-    :name => "debian-6010",
-    :box => "bento/debian-6.0.10",
+    :name => "ubuntu-1604",
+    :box => "bento/ubuntu-16.04",
     :ip => '10.0.0.13',
     :cpu => "50",
     :ram => "256"

diff --git a/meta/main.yml b/meta/main.yml
@@ -9,12 +9,11 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - lucid
         - precise
         - trusty
+        - xenial
     - name: Debian
       versions:
-        - squeeze
         - wheezy
         - jessie
   galaxy_tags:

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -3,18 +3,24 @@
 - name: install dependencies
   apt:
     name: "{{ item }}"
-    state: latest
+    state: "{{ apt_install_state | default('latest') }}"
     update_cache: true
     cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
-  with_items: tsocks_dependencies
-  tags: [configuration, tsocks, tsocks-dependencies]
+  with_items: "{{ tsocks_dependencies }}"
+  tags:
+    - configuration
+    - tsocks
+    - tsocks-dependencies
 
 - name: install additional
   apt:
     name: "{{ item }}"
-    state: latest
-  with_items: tsocks_install
-  tags: [configuration, tsocks, tsocks-install]
+    state: "{{ apt_install_state | default('latest') }}"
+  with_items: "{{ tsocks_install }}"
+  tags:
+    - configuration
+    - tsocks
+    - tsocks-install
 
 - name: update configuration file - /etc/tsocks/tsocks.conf
   template:
@@ -23,4 +29,7 @@
     owner: root
     group: root
     mode: 0644
-  tags: [configuration, tsocks, tsocks-configuration]
+  tags:
+    - configuration
+    - tsocks
+    - tsocks-configuration