Merge pull request #45 from oVirt/minor_fixes

Minor fixes
oVirt · May 2, 2018 · d929082 · d929082
2 parents 402c88d + 6ba9c92
commit d929082
Show file tree

Hide file tree

Showing 21 changed files with 20 additions and 5 deletions.
diff --git a/tasks/clean/remove_disks.yml b/tasks/clean/remove_disks.yml
@@ -4,6 +4,7 @@
           state: absent
           id: "{{ disk.id }}"
           auth: "{{ ovirt_auth }}"
+  ignore_errors: "{{ dr_ignore_error_clean }}"
   tags:
       - fail_back
       - clean_engine
diff --git a/tasks/clean/remove_domain.yml b/tasks/clean/remove_domain.yml
@@ -14,6 +14,7 @@
       until: dr_force or result is not failed
       retries: "{{ dr_cleanup_retries_maintenance }}"
       delay: "{{ dr_cleanup_delay_maintenance }}"
+  ignore_errors: "{{ dr_ignore_error_clean }}"
   tags:
       - fail_back
       - clean_engine
diff --git a/tasks/clean/remove_domain_process.yml b/tasks/clean/remove_domain_process.yml
@@ -37,6 +37,7 @@
     - name: Force remove storage domain
       include_tasks: tasks/clean/remove_domain.yml host="00000000-0000-0000-0000-000000000000"
       when: "dr_force"
+  ignore_errors: "{{ dr_ignore_error_clean }}"
   tags:
       - fail_back
       - clean_engine
diff --git a/tasks/clean/remove_filtered_master_domains.yml b/tasks/clean/remove_filtered_master_domains.yml
@@ -10,6 +10,7 @@
       when: (not only_master and not sd.master) or (only_master and sd.master)
       loop_control:
           loop_var: sd
+  ignore_errors: "{{ dr_ignore_error_clean }}"
   tags:
       - fail_back
       - clean_engine
diff --git a/tasks/clean/remove_vms.yml b/tasks/clean/remove_vms.yml
@@ -4,6 +4,7 @@
           state: absent
           name: "{{ vm.name }}"
           auth: "{{ ovirt_auth }}"
+  ignore_errors: "{{ dr_ignore_error_clean }}"
   tags:
       - fail_back
       - clean_engine
diff --git a/tasks/clean/shutdown_vm.yml b/tasks/clean/shutdown_vm.yml
@@ -6,6 +6,7 @@
           force: True
           wait: True
           auth: "{{ ovirt_auth }}"
+  ignore_errors: "{{ dr_ignore_error_clean }}"
   tags:
           - fail_back
           - clean_engine

diff --git a/tasks/clean/shutdown_vms.yml b/tasks/clean/shutdown_vms.yml
@@ -8,6 +8,7 @@
     # TODO: Add a wait until the VM is really down
     - include_tasks: tasks/clean/shutdown_vm.yml vms={{ item }}
       with_items: "{{ ovirt_vms }}"
+  ignore_errors: "{{ dr_ignore_error_clean }}"
   tags:
       - fail_back
       - clean_engine
diff --git a/tasks/clean/update_ovf_store.yml b/tasks/clean/update_ovf_store.yml
@@ -11,6 +11,7 @@
           auth: "{{ ovirt_auth }}"
       with_items:
         - "{{ ovirt_storage_domains }}"
+  ignore_errors: "{{ dr_ignore_error_clean }}"
   tags:
       - fail_back
       - clean_engine
diff --git a/tasks/clean_engine.yml b/tasks/clean_engine.yml
@@ -1,8 +1,4 @@
 - block:
-    - name: test
-      debug:
-              msg: "{{ dr_source_map }}"
-
     - name: Obtain SSO token
       ovirt_auth:
           url: "{{ vars['dr_sites_' + dr_source_map + '_url'] }}"

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -9,7 +9,7 @@
           - clean_engine
 
     - pause:
-          prompt: "Please update once the destination storage domains are ready to be used for recovery"
+          prompt: "[Failback Replication Sync] Please press ENTER once the destination storage domains are ready to be used for the destination setup"
       tags:
           - fail_back
 

diff --git a/tasks/recover/add_domain.yml b/tasks/recover/add_domain.yml
@@ -42,6 +42,7 @@
         loop_control:
             loop_var: fcp_storage
       when: ovirt_hosts.0 is defined
+  ignore_errors: "{{ dr_ignore_error_recover }}"
   tags:
       - fail_over
       - fail_back

diff --git a/tasks/recover/add_fcp_domain.yml b/tasks/recover/add_fcp_domain.yml
@@ -24,6 +24,7 @@
       set_fact:
         failed_storage_domains: "{{ failed_storage_domains }} + [ \"{{ fcp_storage['dr_' + dr_target_host + '_name']|default('') }}\" ]"
       when: result is failed
+  ignore_errors: "{{ dr_ignore_error_recover }}"
   tags:
       - fail_over
       - fail_back
diff --git a/tasks/recover/add_glusterfs_domain.yml b/tasks/recover/add_glusterfs_domain.yml
@@ -24,6 +24,7 @@
       set_fact:
         failed_storage_domains: "{{ failed_storage_domains }} + [ \"{{ gluster_storage['dr_' + dr_target_host + '_name'] }}\" ]"
       when: result is failed
+  ignore_errors: "{{ dr_ignore_error_recover }}"
   tags:
       - fail_over
       - fail_back
diff --git a/tasks/recover/add_iscsi_domain.yml b/tasks/recover/add_iscsi_domain.yml
@@ -52,6 +52,7 @@
         - name: Log append to failed_storage_domains
           set_fact:
             failed_storage_domains: "{{ failed_storage_domains }} + [ \"{{ iscsi_storage['dr_' + dr_target_host + '_name']|default('') }}\" ]"
+  ignore_errors: "{{ dr_ignore_error_recover }}"
   tags:
       - fail_over
       - fail_back
diff --git a/tasks/recover/add_nfs_domain.yml b/tasks/recover/add_nfs_domain.yml
@@ -20,6 +20,7 @@
   - name: Log append to failed_storage_domains
     set_fact:
       failed_storage_domains: "{{ failed_storage_domains }} + [ \"{{ nfs_storage['dr_' + dr_target_host + '_name'] }}\" ]"
+  ignore_errors: "{{ dr_ignore_error_recover }}"
   tags:
       - fail_over
       - fail_back
diff --git a/tasks/recover/add_posixfs_domain.yml b/tasks/recover/add_posixfs_domain.yml
@@ -25,6 +25,7 @@
       set_fact:
         failed_storage_domains: "{{ failed_storage_domains }} + [ \"{{ posix_storage['dr_' + dr_target_host + '_name'] }}\" ]"
       when: result is failed
+  ignore_errors: "{{ dr_ignore_error_recover }}"
   tags:
       - fail_over
       - fail_back
diff --git a/tasks/recover/register_template.yml b/tasks/recover/register_template.yml
@@ -21,6 +21,7 @@
       set_fact:
         succeed_template_names: "{{ succeed_template_names }} + [ '{{ unreg_template.name }}' ]"
       when: template_register_result | succeeded
+  ignore_errors: "{{ dr_ignore_error_recover }}"
   tags:
       - fail_over
       - fail_back
diff --git a/tasks/recover/register_templates.yml b/tasks/recover/register_templates.yml
@@ -13,6 +13,7 @@
       # We use loop_control so storage.name will not be overriden by the nested loop.
       loop_control:
           loop_var: unreg_template
+  ignore_errors: "{{ dr_ignore_error_recover }}"
   tags:
       - fail_over
       - fail_back
diff --git a/tasks/recover/register_vm.yml b/tasks/recover/register_vm.yml
@@ -24,6 +24,7 @@
     set_fact:
       succeed_vm_names: "{{ succeed_vm_names }} + [ '{{ unreg_vm.name }}' ]"
     when: vm_register_result | succeeded
+  ignore_errors: "{{ dr_ignore_error_recover }}"
   tags:
       - fail_over
       - fail_back
diff --git a/tasks/recover/register_vms.yml b/tasks/recover/register_vms.yml
@@ -16,6 +16,7 @@
       # We use loop_control so storage.name will not be overriden by the nested loop.
       loop_control:
          loop_var: unreg_vm
+  ignore_errors: "{{ dr_ignore_error_recover }}"
   tags:
       - fail_over
       - fail_back
diff --git a/tasks/recover/run_vms.yml b/tasks/recover/run_vms.yml
@@ -15,6 +15,7 @@
       set_fact:
         failed_to_run_vms: "{{ failed_to_run_vms }} + [ '{{ vms.name }}' ]"
       when: result | failed
+  ignore_errors: "{{ dr_ignore_error_recover }}"
   tags:
       - fail_over
       - fail_back