diff --git a/inventory.yml b/inventory.yml
index 691d095..867b93e 100644
--- a/inventory.yml
+++ b/inventory.yml
@@ -14,3 +14,6 @@ all:
     # variable globally or by host.
     # By default : False
     jenkins_installonly: False
+
+    # Check if etckeeper is installed and /etc is clean
+    checketckeeper: True
diff --git a/roles/jenkins-php-v1/tasks/00_precheck.yml b/roles/jenkins-php-v1/tasks/00_precheck.yml
index b091622..e9cdb1d 100644
--- a/roles/jenkins-php-v1/tasks/00_precheck.yml
+++ b/roles/jenkins-php-v1/tasks/00_precheck.yml
@@ -8,17 +8,13 @@
   ignore_errors: True
   register: tmp
   changed_when: False
+  when: checketckeeper is undefined or checketckeeper
 
 - name: Set fact about etckeeper presence
   set_fact:
-    etckeeper_installed: "{{ tmp.rc == 0 }}"
+    etckeeper_installed: "{{ tmp.rc is defined and tmp.rc == 0 }}"
 
 - name: Check that /etc is clean
   shell: etckeeper unclean && echo "Uncommitted changes." && return 1 || return 0
-  ignore_errors: True  # we add a 'fail' task to tell the problem more explictly.
-  register: tmp
   changed_when: False
   when: etckeeper_installed
-- fail:
-    msg: "Etckeeper is installed but there is uncommitted changes in /etc."
-  when: etckeeper_installed and tmp.rc != 0