Merge pull request #25 from OpenNebula/ha-fixes

Fixes to FE HA framework

Author: balazsbme

.gitignore

@@ -6,3 +6,4 @@ __pycache__/
 !/inventory/example.yml
 .vscode
 .ansible/
+inventory/reference/local-ha.yml

inventory/reference/group_vars/all.yml

@@ -4,10 +4,7 @@ ansible_python_interpreter: /usr/bin/python3
 validation:
   # Check if OpenNebula services are running
   core_services: true
-  run_ha_verifications: true
-  one_config_path:
-    - /etc/one
-    - /var/lib/one/remotes/etc
+  run_ha_verifications: true 
   # List of services to check enabled, stop and restart
   service_list:
     - name: opennebula.service
@@ -60,3 +57,8 @@ validation:
       interface_name: 'br-test'
     fencing_check_retries: 8
     fencing_check_delay: 60
+  fe_ha:
+    one_config_path:
+      - /etc/one
+      - /var/lib/one/remotes/etc
+    one_zone_name: OpenNebula

inventory/reference/local-ha.yml

@@ -72,7 +72,7 @@
 - hosts: "{{ frontend_group | d('frontend') }}"
   roles:
     - role: fe_ha
-  when: validation.run_ha_verifications == true
+      when: validation.run_ha_verifications == true 
 
 
 # Run network tests on the hypervisor hosts

playbooks/validation.yml

@@ -29,7 +29,7 @@
 # Get zone details from the first FE, Assuming state set to 3 is the leader state
 - name: Get Zone
   ansible.builtin.shell:
-    cmd: onezone show "{{ one_zone_name }}" -j | jq -r '.ZONE.SERVER_POOL.SERVER | .[] |select(.STATE == "3") | .NAME'
+    cmd: onezone show "{{ validation.fe_ha.one_zone_name }}" -j | jq -r '.ZONE.SERVER_POOL.SERVER | .[] |select(.STATE == "3") | .NAME'
   register: zone_details 
   ignore_errors: true
   when: hostvars[groups[frontend_group | d('frontend')][0]]['ansible_host'] == ansible_host 
@@ -42,7 +42,7 @@
     file_type: file
     recurse: true 
   register: found_files
-  loop: "{{ validation.one_config_path }}"
+  loop: "{{ validation.fe_ha.one_config_path }}"
 
 - name: Set combined list 
   set_fact:
@@ -78,9 +78,9 @@
   loop: "{{ groups.frontend }}"
   run_once: true
 
-- name: Save /etc/one content checks 
+- name: Save file content checks 
   set_fact:
-    verification_result: "{{ verification_result | combine({'Check Content /etc/one diretory for file diffs at all FE nodes. Diff files': diff_files }) }}"
+    verification_result: "{{ verification_result | combine({'Check Content of the config diretory for file diffs at all FE nodes. Diff files': diff_files }) }}"
   run_once: true
 
 ### Leader failover tests