Merge pull request #4 from AutomationWithAnsible/feature/cleanup

ahelal · ahelal · commit 114628485d74 · 2016-01-11T19:46:13.000+01:00
Feature/cleanup
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.kitchen
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -0,0 +1,33 @@
+---
+driver                 :
+    # TRAVIS: local
+    # NO TRAVIS: vagrant
+    name               : <%= if ENV['TRAVIS'] then 'localhost' else 'vagrant' end  %>
+
+provisioner:
+    name               : ansible_push
+    verbose            : "vvvv"
+    ansible_config     : "tests/ansible.cfg"
+    idempotency_test   : True
+    # TRAVIS: True
+    # NO TRAVIS: False
+    sudo               : <%= if ENV['TRAVIS'] then 'True' else 'False' end  %>
+
+platforms:
+    # travistravis
+     - name            : <%= if ENV['TRAVIS'] then 'travis' else 'ubuntu-14.04' end %>
+       provisioner     :
+         raw_arguments : <%= if ENV['TRAVIS'] then '-c local' else '' end %>
+       # Should be safily ignored by Travis since connection local
+       driver          :
+         box           : ubuntu/trusty64
+       customize       :
+        cpus           : 2
+        memory         : 2048
+
+suites:
+  - name               : simple
+    provisioner        :
+        playbook       : "tests/application/simple.yml"
+        extra_vars     : { 'kitchen_connection': 'smart', 'kitchen_hosts': '<%= if ENV['TRAVIS'] then 'localhost' else 'all' end %>' }
+
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,21 @@
+---
+language: python
+python: "2.7"
+
+before_install:
+  # Make sure everything's up to date.
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq python-apt python-pycurl git python-pip ruby ruby-dev build-essential autoconf
+  - gem install bundler
+
+install:
+  - sudo pip install ansible
+
+script:
+    - ansible --version
+    - export TRAVIS=True
+    - bundle install
+    - bundle exec kitchen test travis
+
+after_success:
+    - echo "Success"
diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+
+group :development do
+  gem 'test-kitchen'
+  gem 'kitchen-vagrant'
+  gem 'kitchen-ansiblepush'
+  gem 'kitchen-localhost'
+end
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,38 +1,38 @@
 ---
-nginx_etc              : "/etc/nginx/"
-nginx_default_root     : "/usr/share/nginx/html" # Will  only work for ubuntu
-nginx_max_clients      : 512
-nginx_install_repo     : "ubuntu" # Options: ["nginx", "ubuntu"]
-nginx_apt_state        : "present" # Options: ["latest", "present"]
+nginx_etc                        : "/etc/nginx/"
+nginx_default_root               : "/usr/share/nginx/html" # Will  only work for ubuntu
+nginx_max_clients                : 512
+nginx_install_repo               : "ubuntu" # Options: ["nginx", "ubuntu"]          
+nginx_apt_state                  : "present" # Options: ["latest", "present"]
 
-nginx_http_params:
-  sendfile: "on"
-  tcp_nopush: "on"
-  tcp_nodelay: "on"
-  keepalive_timeout: "65"
-  access_log: "/var/log/nginx/access.log"
-  error_log: "/var/log/nginx/error.log"
+nginx_http_params                :
+  sendfile                       : "on"
+  tcp_nopush                     : "on"
+  tcp_nodelay                    : "on"
+  keepalive_timeout              : "65"
+  access_log                     : "/var/log/nginx/access.log"
+  error_log                      : "/var/log/nginx/error.log"
 
-nginx_site                            :
-   - file_name                        : "test"
-     blocks                           :
-       - type                         : "server"
-         index                        : "index.html index.htm"
-         server_name                  : localhost
-         listen                       : 80
+nginx_site                       :
+   - file_name                   : "test"
+     blocks                      :
+       - type                    : "server"
+         index                   : "index.html index.htm"
+         server_name             : localhost
+         listen                  : 80
          ## Use josn
-         location1                    : {
-                                          name: /,
-                                          type: location,
-                                          try_files: "$uri $uri/ /index.html",
-                                          root: "{{ nginx_default_root }}"
-                                        }
+         location1               : {
+                                     name: /,
+                                     type: location,
+                                     try_files: "$uri $uri/ /index.html",
+                                     root: "{{ nginx_default_root }}"
+                                   }
          ## Use yaml
-         location2                    : 
-                          name        : /doc/,
-                          type        : location
-                          alias       : "/usr/share/doc/"
-                          autoindex   : "on" 
-                          allow       : "127.0.0.1"
-                          deny        : "all" 
+         location2               : 
+                     name        : /doc/
+                     type        : location
+                     alias       : "/usr/share/doc/"
+                     autoindex   : "on" 
+                     allow       : "127.0.0.1"
+                     deny        : "all" 
 
diff --git a/handlers/main.yml b/handlers/main.yml
@@ -1,10 +1,25 @@
 ---
+
+- name: check restart nginx
+  command: 
+    nginx -t -c "{{ nginx_etc }}/nginx.conf"
+  changed_when: True
+  notify:
+    - restart nginx
+
+- name: check reload nginx
+  command: 
+    nginx -t -c "{{ nginx_etc }}/nginx.conf"
+  changed_when: True
+  notify:
+    - reload nginx
+
 - name: restart nginx
   service: 
-      name=nginx 
-      state=restarted 
+    name=nginx
+    state=restarted
 
 - name: reload nginx
   service: 
-      name=nginx 
-      state=reloaded
+    name=nginx
+    state=reloaded
diff --git a/meta/main.yml b/meta/main.yml
@@ -22,5 +22,4 @@ galaxy_info:
       - saucy
   categories:
    - web
-dependencies: []
-  
+dependencies: []
diff --git a/tasks/common.yml b/tasks/common.yml
@@ -2,7 +2,7 @@
 
 - name: common | Create the directories for site specific configurations
   file: 
-      path="{{nginx_etc}}/{{item}}"
+      path="{{ nginx_etc }}/{{ item }}"
       state=directory
       owner=root
       group=root
@@ -13,49 +13,49 @@
 
 - name: common | Copy the nginx default configuration file 
   template: 
-      src=default.j2
-      dest="{{ nginx_etc }}/sites-available/default.conf"
+    src=default.j2
+    dest="{{ nginx_etc }}/sites-available/default.conf"
 
 - name: common |Copy the nginx default site configuration file 
   template: 
-      src=default.j2
-      dest="{{nginx_etc}}/sites-available/default"
+    src=default.j2
+    dest="{{ nginx_etc }}/sites-available/default"
 
 - name: common | Create the link for site enabled specific configurations
   file: 
-      path="{{nginx_etc}}/sites-enabled/default"
-      state=link
-      src="{{nginx_etc}}/sites-available/default"
+    path="{{ nginx_etc }}/sites-enabled/default"
+    state=link
+    src="{{ nginx_etc }}/sites-available/default"
 
 - name: common | Create the  configuration files for nginx
   template:
-      src=site.j2
-      dest="{{nginx_etc}}/sites-available/{{item.file_name}}.conf"
+    src=site.j2
+    dest="{{ nginx_etc }}/sites-available/{{ item.file_name }}.conf"
   with_items: nginx_site
-  when: nginx_site |lower != 'none'
+  when: nginx_site | lower != 'none'
   notify: 
-   - reload nginx
+   - check reload nginx
 
 ## TODO: Add conidition to disable/enable sites
 - name: Create the link for site enabled specific configurations
   file: 
-     path="{{nginx_etc}}/sites-enabled/{{item.file_name}}.conf"
+     path="{{ nginx_etc }}/sites-enabled/{{ item.file_name }}.conf"
      state=link
-     src="{{nginx_etc}}/sites-available/{{item.file_name}}.conf"
+     src="{{ nginx_etc }}/sites-available/{{ item.file_name }}.conf"
   with_items: nginx_site   
   notify: 
-   - reload nginx
+   - check reload nginx
 
 - name: common | Copy the nginx main configuration file 
   template: 
-      src=nginx.conf.j2
-      dest="{{nginx_etc}}/nginx.conf"
-      validate='nginx -t -c %s'
+    src=nginx.conf.j2
+    dest="{{ nginx_etc }}/nginx.conf"
+    validate='nginx -t -c %s'
   notify: 
-   - restart nginx   
+   - check restart nginx   
 
 - name: common | start the nginx service
   service: 
-      name=nginx
-      state=started
-      enabled=yes
+    name=nginx
+    state=started
+    enabled=yes
diff --git a/tasks/nginx_debian.yml b/tasks/nginx_debian.yml
@@ -13,8 +13,8 @@
 
 - name: nginx_debian | Install the nginx packages 
   apt: 
-      name={{ item }} 
-      state={{nginx_apt_state}}
+      name="{{ item }}"
+      state="{{nginx_apt_state}}"
   with_items: ubuntu_pkg
-  environment: env
+  environment: "{{ env }}"
   when: ansible_os_family == "Debian"
diff --git a/tasks/nginx_redhat.yml b/tasks/nginx_redhat.yml
@@ -24,6 +24,6 @@
 
 - name: nginx_redhat | Install the nginx packages 
   yum: 
-      name={{ item }}
+      name="{{ item }}"
       state=present
   with_items: redhat_pkg
diff --git a/tasks/nginx_smartos.yml b/tasks/nginx_smartos.yml
@@ -1,19 +1,19 @@
 ---
 
 - name: nginx_smartos | Set etc nginx
-  set_fact:
-    nginx_etc              : "/opt/local/etc/nginx"
+  set_fact :
+    nginx_etc : "/opt/local/etc/nginx"
 
 - name: nginx_smartos | Install the nginx packages 
   pkgin: 
-      name="{{item}}"
-      state=present 
+      name="{{ item }}"
+      state=present
   with_items: solaris_pkg
 
 - name: common | Create the conf.d
   file: 
-      path="{{nginx_etc}}/conf.d"
-      state=directory 
-      owner=root 
-      group=root 
+      path="{{ nginx_etc }}/conf.d"
+      state=directory
+      owner=root
+      group=root
       mode=0755
diff --git a/templates/nginx.conf.j2 b/templates/nginx.conf.j2
@@ -1,14 +1,14 @@
 #{{ ansible_managed }}
 {% if ansible_os_family == 'RedHat' %} 
-user              nginx;
+user    nginx;
 {% elif ansible_os_family == 'Debian' %} 
-user              www-data;
+user    www-data;
 {% elif ansible_os_family == 'Solaris' %} 
-user   www  www;
+user    www  www;
 {% endif %}
 
 worker_processes  {{ ansible_processor_count }};
-pid        /var/run/nginx.pid;
+pid  /var/run/nginx.pid;
 
 {% if nginx_extra_global_vars is defined %}
 # Extra global vars for Nginx
@@ -22,15 +22,15 @@ events {
 }
 
 http {
-        include {{nginx_etc}}/mime.types;
-        default_type application/octet-stream;
+    include {{ nginx_etc }}/mime.types;
+    default_type application/octet-stream;
 {% for k,v in nginx_http_params.iteritems() %}
-        {{ k }}  {{ v }};
+    {{ k }}  {{ v }};
 {% endfor %}
-		#sendfile        on;
-        gzip on;
-        gzip_disable "msie6";
+	#sendfile        on;
+    gzip on;
+    gzip_disable "msie6";
 
-        include {{nginx_etc}}/conf.d/*.conf;
-        include {{nginx_etc}}/sites-enabled/*;
+    include {{ nginx_etc }}/conf.d/*.conf;
+    include {{ nginx_etc }}/sites-enabled/*;
 }
diff --git a/templates/site.j2 b/templates/site.j2
@@ -1,4 +1,4 @@
-##{{ansible_managed}}
+##{{ ansible_managed }}
 {% for block in item.blocks %}
 {# First level block #}
 {{block.type}} {{ block.name if block.name is defined else "" }} {
diff --git a/tests/ansible.cfg b/tests/ansible.cfg
@@ -0,0 +1,2 @@
+[defaults]
+roles_path=../:../../:/spec/
diff --git a/tests/application/simple.yml b/tests/application/simple.yml
@@ -0,0 +1,33 @@
+---
+- name         : Simple
+  hosts        : "{{ kitchen_hosts }}"
+  gather_facts : true
+  sudo         : True
+  connection   : "{{ kitchen_connection | default('local') }}"
+  vars         :
+        nginx_site                       :
+           - file_name                   : "test"
+             blocks                      :
+               - type                    : "server"
+                 index                   : "index.htm index.htm"
+                 server_name             : localhost
+                 listen                  : 1080
+                 ## Use josn
+                 location1               : {
+                                             name: /,
+                                             type: location,
+                                             try_files: "$uri $uri/ /index.html",
+                                             root: "{{ nginx_default_root }}"
+                                           }
+                 ## Use yaml
+                 location2               : 
+                             name        : /doc/
+                             type        : location
+                             alias       : "/usr/share/doc/"
+                             autoindex   : "on" 
+                             allow       : "127.0.0.2"
+                             deny        : "all" 
+
+  roles        :
+                 - "ansible-nginx"
+
diff --git a/vars/main.yml b/vars/main.yml
