Merge branch 'seleznev-configuring-environment'

Author: franklinkim

.travis.yml

@@ -43,7 +43,7 @@ script:
   - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/${role}/tests/main.yml | tee -a ${idempotence}
   - >
     tail ${idempotence}
-    | grep -q 'failed=0'
+    | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 

Makefile

@@ -4,7 +4,8 @@ ROLE_PATH=/etc/ansible/roles/$(ROLE_NAME)
 TEST_VERSION=ansible --version
 TEST_SYNTAX=ansible-playbook -vv -i 'localhost,' -c local $(ROLE_PATH)/tests/main.yml --syntax-check
 TEST_PLAYBOOK=ansible-playbook -vv -i 'localhost,' -c local $(ROLE_PATH)/tests/main.yml
-TEST_CMD=$(TEST_VERSION); $(TEST_SYNTAX); $(TEST_PLAYBOOK)
+TEST_IDEMPOTENT=$(TEST_PLAYBOOK) | grep -q 'changed=0.*failed=0' && (echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1)
+TEST_CMD=$(TEST_VERSION); $(TEST_SYNTAX); $(TEST_PLAYBOOK); $(TEST_IDEMPOTENT)
 
 ubuntu16.04: dist=ubuntu-16.04
 ubuntu16.04: .run

defaults/main.yml

@@ -1,5 +1,6 @@
 ---
 
+
 # Path to the environment file
 environment_file: /etc/environment
 # The environment file owner

tasks/config.yml

@@ -9,15 +9,9 @@
   register: environment_file_result
   changed_when: environment_file_result.state != "file"
 
-- name: Remove previous values
-  lineinfile:
-    dest: "{{ environment_file }}"
-    regexp: '^{{ item.key }}\ ?='
-    state: absent
-  with_dict: "{{ environment_config }}"
-
 - name: Configuring environment
   lineinfile:
     dest: "{{ environment_file }}"
+    regexp: '^{{ item.key }}\ ?='
     line: "{{ item.key }}='{{ item.value }}'"
   with_dict: "{{ environment_config }}"