Address code review comments

Author: jovial

etc/kayobe/ansible/nova-compute-drain.yml

@@ -9,35 +9,3 @@
   tasks:
     - include_role:
         name: nova-compute-drain
-        tasks_from: setup.yml
-      run_once: true
-
-    - include_role:
-        name: nova-compute-drain
-        tasks_from: instance-info.yml
-
-    - include_role:
-        name: nova-compute-drain
-        tasks_from: live-migrate.yml
-      loop: "{{ nova_compute_drain_instance_info | selectattr('Status', 'equalto', 'ACTIVE') | list }}"
-      loop_control:
-        label: "{{ item.ID | default }}"
-
-    - include_role:
-        name: nova-compute-drain
-        tasks_from: cold-migrate.yml
-      loop: "{{ nova_compute_drain_instance_info | selectattr('Status', 'equalto', 'SHUTOFF') | list }}"
-      loop_control:
-        label: "{{ item.ID | default }}"
-
-    - include_role:
-        name: nova-compute-drain
-        tasks_from: instance-info.yml
-
-    - name: Fail if there are instances still on the host
-      fail:
-        msg: >
-          Instances still on {{ inventory_hostname }}: {{ instances.stdout | from_json }}
-      when:
-        - nova_compute_migration_fatal | bool
-        - nova_compute_drain_instance_info | length > 0

etc/kayobe/ansible/roles/nova-compute-drain/tasks/cold-migrate.yml

@@ -31,6 +31,7 @@
     retries: 10
     delay: 30
   environment: "{{ openstack_auth_env }}"
+  delegate_to: "{{ nova_compute_drain_delegate_host }}"
   vars:
     ansible_host: "{{ hostvars[nova_compute_drain_delegate_host].ansible_host }}"
     instance_uuid: "{{ item.ID | default }}"

etc/kayobe/ansible/roles/nova-compute-drain/tasks/instance-info.yml

@@ -2,10 +2,11 @@
 - name: Query instances
   command: >
     {{ nova_compute_drain_venv }}/bin/openstack
-    server list --host {{ ansible_facts.fqdn }}
+    server list --host {{ ansible_facts.nodename }}
     --all-projects
     --format json
   register: instances
+  delegate_to: "{{ nova_compute_drain_delegate_host }}"
   environment: "{{ openstack_auth_env }}"
   vars:
     ansible_host: "{{ hostvars[nova_compute_drain_delegate_host].ansible_host }}"

etc/kayobe/ansible/roles/nova-compute-drain/tasks/live-migrate.yml

@@ -8,6 +8,7 @@
     {{ instance_uuid }}
     --live-migration
     --wait
+  delegate_to: "{{ nova_compute_drain_delegate_host }}"
   environment: "{{ openstack_auth_env }}"
   vars:
     instance_uuid: "{{ item.ID | default }}"

etc/kayobe/ansible/roles/nova-compute-drain/tasks/setup.yml

@@ -20,7 +20,7 @@
     virtualenv: "{{ nova_compute_drain_venv }}"
     name:
       - python-openstackclient
-
+    extra_args: "{% if pip_upper_constraints_file %}-c {{ pip_upper_constraints_file }}{% endif %}"
   run_once: true
   delegate_to: "{{ nova_compute_drain_delegate_host }}"
   vars: