Merge pull request #57 from oVirt/BZFixes

Bz fixes

files/ovirt-dr

@@ -37,29 +37,35 @@ def main(argv):
             sys.exit(2)
 
         create_log_dir(log_file)
-        if log_file is not None and log_file != '':
-            print("Log file: '%s'" % log_file)
+        _print_log_file_name(log_file)
     if action == 'validate':
         validator.ValidateMappingFile().run(conf_file)
     elif action == 'generate':
         generate_vars.GenerateMappingFile().run(conf_file,
                                                 log_file,
                                                 logg.getLevelName(log_level))
+        _print_log_file_name(log_file)
     elif action == 'failover':
         fail_over.FailOver().run(conf_file,
                                  log_file,
                                  logg.getLevelName(log_level))
+        _print_log_file_name(log_file)
     elif action == 'failback':
         fail_back.FailBack().run(conf_file,
                                  log_file,
                                  logg.getLevelName(log_level))
+        _print_log_file_name(log_file)
     elif action == '--help':
         help_log()
     else:
         print "\tError: action '%s' is not defined" % action
         help_log()
 
 
+def _print_log_file_name(log_file):
+    if log_file is not None and log_file != '':
+        print("Log file: '%s'" % log_file)
+
 def _init_vars(argv):
     conf_file = DEF_CONF_FILE
     log_file = ''

tasks/recover/add_nfs_domain.yml

@@ -12,12 +12,12 @@
         nfs:
             path: "{{ nfs_storage['dr_' + dr_target_host + '_path'] }}"
             address: "{{ nfs_storage['dr_' + dr_target_host + '_address'] }}"
-  - name: Log append to failed storage domains
+  - name: Log append to successful storage domains
     set_fact:
       succeed_storage_domains: "{{ succeed_storage_domains }} + [ \"{{ nfs_storage['dr_' + dr_target_host + '_name'] }}\" ]"
 
   rescue:
-  - name: Log append to failed_storage_domains
+  - 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 }}"

tasks/recover/print_info.yml

@@ -8,7 +8,8 @@
       shell: cat /tmp/{{ dr_report_file }}
       register: content
 
-    - debug: msg="{{ content.stdout_lines | quote }}"
+    - name: Pring report file to stdout
+      debug: msg="{{ content.stdout_lines | quote }}"
   tags:
       - fail_over
       - fail_back

tasks/recover/register_vm.yml

@@ -1,5 +1,5 @@
 - block:
-  - name: register VMs
+  - name: Register VMs
     ovirt_vms:
         state: registered
         storage_domain: "{{ storage.name }}"