Merge pull request #6 from zeelax/fix/ansible-2.x

Ansible 2.x compatibility stuff

Author: ahelal

defaults/main.yml

@@ -23,7 +23,7 @@ nginx_site                       :
          index                   : "index.html index.htm"
          server_name             : localhost
          listen                  : 80
-         ## Use josn
+         ## Use json
          location1               : {
                                      name: /,
                                      type: location,

tasks/common.yml

@@ -31,7 +31,7 @@
   template:
     src=site.j2
     dest="{{ nginx_etc }}/sites-available/{{ item.file_name }}.conf"
-  with_items: nginx_site
+  with_items: "{{ nginx_site }}"
   when: nginx_site | lower != 'none'
   notify: 
    - check reload nginx
@@ -42,7 +42,7 @@
      path="{{ nginx_etc }}/sites-enabled/{{ item.file_name }}.conf"
      state=link
      src="{{ nginx_etc }}/sites-available/{{ item.file_name }}.conf"
-  with_items: nginx_site   
+  with_items: "{{ nginx_site }}"
   notify: 
    - check reload nginx
 
@@ -61,4 +61,4 @@
   service: 
     name=nginx
     state=started
-    enabled=yes
+    enabled=yes

tasks/nginx_debian.yml

@@ -15,6 +15,6 @@
   apt: 
       name="{{ item }}"
       state="{{nginx_apt_state}}"
-  with_items: ubuntu_pkg
+  with_items: "{{ ubuntu_pkg }}"
   environment: "{{ env }}"
-  when: ansible_os_family == "Debian"
+  when: ansible_os_family == "Debian"

tasks/nginx_redhat.yml

@@ -26,4 +26,4 @@
   yum: 
       name="{{ item }}"
       state=present
-  with_items: redhat_pkg
+  with_items: "{{ redhat_pkg }}"

tasks/nginx_smartos.yml

@@ -8,7 +8,7 @@
   pkgin: 
       name="{{ item }}"
       state=present
-  with_items: solaris_pkg
+  with_items: "{{ solaris_pkg }}"
 
 - name: common | Create the conf.d
   file: