From e31a313f3cec941ca49469df921f28c106b598ed Mon Sep 17 00:00:00 2001
From: Will Miller <willm@stackhpc.com>
Date: Thu, 30 Aug 2018 08:09:54 +0000
Subject: [PATCH 1/3] Check IPMI port count before creating VMs

---
 ansible/deploy.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ansible/deploy.yml b/ansible/deploy.yml
index 489f59c..55507f8 100644
--- a/ansible/deploy.yml
+++ b/ansible/deploy.yml
@@ -50,11 +50,6 @@
       {{ hostvars['localhost'].allocations.result[inventory_hostname]
            | default([]) }}
   tasks:
-    - name: Create Libvirt VMs
-      include_tasks: libvirt_create_vms.yml
-      vars:
-        vms: "{{ nodes }}"
-
     - name: Check that enough ports are available for Virtual BMC
       fail:
         msg: >
@@ -64,6 +59,11 @@
       when: >-
           (nodes | count) > (ipmi_port_range_end - ipmi_port_range_start)
 
+    - name: Create Libvirt VMs
+      include_tasks: libvirt_create_vms.yml
+      vars:
+        vms: "{{ nodes }}"
+
     - name: Set up Virtual BMC daemon
       include_role:
         name: virtualbmc-daemon

From 2cc0bb6da4264b3883511d75c24404cdd7b0e080 Mon Sep 17 00:00:00 2001
From: Will Miller <willm@stackhpc.com>
Date: Thu, 30 Aug 2018 08:12:24 +0000
Subject: [PATCH 2/3] Set up VBMCD with Libvirt host setup

---
 ansible/deploy.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ansible/deploy.yml b/ansible/deploy.yml
index 55507f8..ef52770 100644
--- a/ansible/deploy.yml
+++ b/ansible/deploy.yml
@@ -5,7 +5,8 @@
 
 - hosts: libvirt
   tasks:
-    - include_role:
+    - name: Configure host for Libvirt
+      include_role:
         name: stackhpc.libvirt-host
       vars:
         libvirt_host_pools:
@@ -18,6 +19,13 @@
             group: "{{ libvirt_pool_group }}"
         libvirt_host_require_vt: "{{ libvirt_require_vt }}"
 
+    - name: Set up Virtual BMC daemon
+      include_role:
+        name: virtualbmc-daemon
+      vars:
+        vbmcd_virtualenv_path: "{{ virtualenv_path }}"
+        vbmcd_python_upper_contraints_url: "{{ python_upper_constraints_url }}"
+
 # Ensure we have facts about all hypervisors before scheduling begins.
 - hosts: hypervisors
   gather_facts: true
@@ -64,14 +72,6 @@
       vars:
         vms: "{{ nodes }}"
 
-    - name: Set up Virtual BMC daemon
-      include_role:
-        name: virtualbmc-daemon
-      vars:
-        vbmcd_virtualenv_path: "{{ virtualenv_path }}"
-        vbmcd_python_upper_contraints_url: "{{ python_upper_constraints_url }}"
-      when: (nodes | count) > 0
-
     - name: Register domains with Virtual BMC
       include_role:
         name: virtualbmc-domain

From 0d88c38c1b22b4421e2b4bea611d132339906c65 Mon Sep 17 00:00:00 2001
From: Will Miller <willm@stackhpc.com>
Date: Thu, 30 Aug 2018 09:15:13 +0000
Subject: [PATCH 3/3] Move VBMCD service name into vars file

---
 ansible/roles/virtualbmc-daemon/tasks/main.yml | 4 ----
 ansible/roles/virtualbmc-daemon/vars/main.yml  | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)
 create mode 100644 ansible/roles/virtualbmc-daemon/vars/main.yml

diff --git a/ansible/roles/virtualbmc-daemon/tasks/main.yml b/ansible/roles/virtualbmc-daemon/tasks/main.yml
index 6f57966..5dd895c 100644
--- a/ansible/roles/virtualbmc-daemon/tasks/main.yml
+++ b/ansible/roles/virtualbmc-daemon/tasks/main.yml
@@ -1,8 +1,4 @@
 ---
-- name: Set service name
-  set_fact:
-    service: vbmcd
-
 - name: Ensure Python requirements are installed
   pip:
     requirements: "{{ '/'.join([role_path, 'files', 'requirements.txt']) }}"
diff --git a/ansible/roles/virtualbmc-daemon/vars/main.yml b/ansible/roles/virtualbmc-daemon/vars/main.yml
new file mode 100644
index 0000000..176ea55
--- /dev/null
+++ b/ansible/roles/virtualbmc-daemon/vars/main.yml
@@ -0,0 +1,3 @@
+---
+# The name of the Virtual BMC daemon systemd service.
+service: vbmcd