Merge pull request #1 from AutomationWithAnsible/feature/remove-tab

Remove tab char \t

.travis.yml

@@ -15,16 +15,14 @@ install:
 
 script:
     # 1st: check syntax
-    - ansible-playbook -i tests/inv.ini tests/test_travis.yml --syntax-check
+    - ansible-playbook -i tests/play.ini tests/test_default.yml --syntax-check
 
     # 2nd:  Make sure we run the entire playbook
-    - ansible-playbook -i tests/inv.ini tests/test_travis.yml --sudo
+    - ansible-playbook -i tests/play.ini tests/test_default.yml --sudo
 
     # 3rd:  Make sure our playbook is idempotent
     - >
-      ansible-playbook -i tests/option1.ini tests/test_travis.yml --sudo
+      ansible-playbook -i tests/play.ini tests/test_default.yml --sudo
       | grep -q 'changed=0.*failed=0'
       && (echo 'Idempotence test: pass' && exit 0)
-      || (echo 'Idempotence test: fail' && exit 1)
-    # 4th: options test
-    - ./tests/test_logs.sh
+      || (echo 'Idempotence test: fail' && exit 1)

README.md

@@ -27,8 +27,11 @@ hostname_sub_replace  :  false
 
 hostname_hosts_file   :
                         - regexp : "^127.0.0.1"
-                          line   : "127.0.0.1{{'\t'}}localhost"
+                          line   : "127.0.0.1  localhost"
 
                         - regexp : "^127.0.1.1"
                           line   : "127.0.1.1{{ lookup('template', '../templates/hosts_file.j2') }}"
 ```
+
+# TODO
+use server sepc for test

defaults/main.yml

@@ -16,7 +16,7 @@ hostname_sub_replace  :  false
 
 hostname_hosts_file   :
                         - regexp : "^127.0.0.1"
-                          line   : "127.0.0.1{{'\t'}}localhost"
+                          line   : "127.0.0.1  localhost"
 
                         - regexp : "^127.0.1.1"
                           line   : "127.0.1.1{{ lookup('template', '../templates/hosts_file.j2') }}"

templates/hosts_file.j2

@@ -1 +1 @@
-{{'\t'}}{{hostname_fqdn}}{% if hostname_fqdn != hostname_short %}{{'\t'}}{{hostname_short}}{% endif %}{% if inventory_hostname.split(".")[0] != hostname_short %}{{'\t'}}{{ inventory_hostname.split(".")[0] }}{% endif %}
+  {{hostname_fqdn}}{% if hostname_fqdn != hostname_short %}  {{hostname_short}}{% endif %}{% if inventory_hostname.split(".")[0] != hostname_short %}  {{ inventory_hostname.split(".")[0] }}{% endif %}

tests/test_default.yml

@@ -2,7 +2,7 @@
 - hosts: test
   sudo: yes
   vars:
-    correct_short_hostname: "default.berlin.de.example.com"
+    correct_short_hostname: "play.berlin.de.example.com"
   #remote_user: root
   roles:
     - ansible-hostname
@@ -11,7 +11,8 @@
       command: hostname
       register: my_hostname
       changed_when: False
-
+    - debug: var=my_hostname
+    - debug: var=correct_short_hostname
     - name: Assert hostname command
       assert:
         that: