Merge pull request #31 from oVirt/master-post-branch

Rebase on ansible 2.9

.travis.yml

@@ -2,7 +2,7 @@
 sudo: required
 language: python
 python:
-    - "2.7"
+    - "3.6"
 
 services:
   - docker

README.md

@@ -24,7 +24,7 @@ Possible improvements are tracked here: https://bugzilla.redhat.com/1609029
 Requirements
 ------------
 
- * Ansible version 2.6 or higher
+ * Ansible version 2.9 or higher
  * Python SDK version 4.2 or higher
 
 Dependencies

automation.yaml

@@ -3,4 +3,4 @@ distros:
   - el7
   - el8
 release_branches:
-  master: [ "ovirt-master", "ovirt-4.3" ]
+  master: ovirt-master

build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION="1.0.5"
+VERSION="1.1.0"
 MILESTONE=master
 RPM_RELEASE="0.0.$MILESTONE.$(date -u +%Y%m%d%H%M%S)"
 

meta/main.yml

@@ -7,7 +7,7 @@ galaxy_info:
 
   license: Apache License 2.0
 
-  min_ansible_version: 2.7
+  min_ansible_version: 2.9
 
   platforms:
   - name: EL

ovirt-ansible-shutdown-env.spec.in

@@ -14,7 +14,7 @@ Group:          Virtualization/Management
 BuildArch:      noarch
 Url:            http://www.ovirt.org
 
-Requires: ansible >= 2.7
+Requires: ansible >= 2.9
 
 %description
 This Ansible role provide funtionality to perform a clean and ordered shutdown of all the entities (vms, hosts)

tasks/main.yml

@@ -86,9 +86,10 @@
           hosted-engine --set-maintenance --mode=none
 
     - name: Get VM list
-      ovirt_vm_facts:
+      ovirt_vm_info:
         auth: "{{ ovirt_auth }}"
         all_content: true
+      register: vm_result
 
     - block:
         - name: Shutdown all VMs, except HostedEngine
@@ -99,13 +100,14 @@
             wait: true
           when: "item.origin != 'managed_hosted_engine'"
           with_items:
-            - "{{ ovirt_vms }}"
+            - "{{ vm_result.ovirt_vms }}"
           ignore_errors: true
 
         - name: Refresh VM list
-          ovirt_vm_facts:
+          ovirt_vm_info:
             auth: "{{ ovirt_auth }}"
             all_content: true
+          register: vm_result
 
         - name: Forcefully shutdown remaining VMs, except HostedEngine
           ovirt_vm:
@@ -116,7 +118,7 @@
             force: true
           when: "item.origin != 'managed_hosted_engine' and item.status != 'down'"
           with_items:
-            - "{{ ovirt_vms }}"
+            - "{{ vm_result.ovirt_vms }}"
 
         - name: Shutdown hosts, except HE ones, via IPMI (if configured)
           ovirt_host: