Revert "vm-boostrap playbook: skip some tasks when playbook is well configured"

This reverts commit 910d2148.

Actually, we will simply stop executing the playbook totally after it is
well configured.

playbook/imt-vm-bootstrap.yml

@@ -6,12 +6,8 @@
     - name: Get mounted disk list
       script: roles/vm-bootstrap/files/mounted_disk
       register: vd_list
-    - name: resgister completed variable
-      stat: path=/etc/opt/vm-bootstrap-completed
-      register: ansible_completed
 
   vars:
-    is_playbook_ok: "{{ ansible_completed.stat.exists }}"
     logrotate_args:
       - name: vm-bootstrap
         path: /var/log/vm-bootstrap.log
@@ -38,10 +34,4 @@
     - { role: vm-disks, vd_disk: k, data_n: 10, when: vd_list.stdout.find("vdk") != -1 }
     - role: logrotate
       logrotate_scripts: "{{ logrotate_args }}"
-      when: ansible_completed.stat.exists == False
 
-  tasks:
-    - name: Set tasks complete
-      file: path=/etc/opt/vm-bootstrap-completed state=touch
-      when: ansible_completed.stat.exists == False
-      changed_when: false

playbook/roles/vm-bootstrap/tasks/main.yml

   - include: uploadlog.yml
-    when: is_playbook_ok in [False, "False"]
 
   - include: rerun.yml
-    when: is_playbook_ok in [False, "False"]
 
   - name: Create /etc/opt dir
     file: dest=/etc/opt mode=775 state=directory

playbook/roles/vm-bootstrap/tasks/resolv_conf.yml

@@ -9,4 +9,3 @@
 
   - name: Delete nameserver 8.8.8.8
     lineinfile: dest=/etc/resolv.conf line="nameserver 8.8.8.8" state=absent
-    when: is_playbook_ok in [False, "False"]

playbook/roles/vm-bootstrap/tasks/ssh.yml

@@ -50,12 +50,11 @@
     register: permitrootlogin
     ignore_errors: True
     changed_when: False
-    when: is_playbook_ok in [False, "False"]
 
   - name: update /etc/ssh/sshd_config
     lineinfile: dest=/etc/ssh/sshd_config regexp="^PermitRootLogin (.*)" line="PermitRootLogin no" state=present
     notify:
       - restart ssh
       - restart sshd
-    when: is_playbook_ok in [False, "False"] and permitrootlogin.rc != 0
+    when: permitrootlogin.rc != 0
 

playbook/roles/vm-bootstrap/tasks/upgrader.yml

 ---
-  - name: Remove playbook completed file
-    file: path=/etc/opt/vm-bootstrap-completed state=absent
-
   - file: path=/opt/upgrader state=directory mode=0755
 
   - stat: path=/opt/upgrader/current-upgrade-signature

playbook/roles/vm-bootstrap/tasks/user.yml

@@ -27,4 +27,3 @@
     with_items:
       - slapos
       - nexedi
-    when: is_playbook_ok in [False, "False"]