From 89a031726ec9455155c73ac7642e4b1f297f1db7 Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Fri, 5 Apr 2019 20:39:11 -0400
Subject: [PATCH] nova: reduce playbooks runs to control/compute

During deployment or upgrades, there isn't a reason to deploy a
service after another.  There is no documented requirement for the
order of upgrades either.

We also start services in a specific order using the systemd_service
role which means that we can simplify this into two main role includes,
control plane and data plane (computes).  This is to make sure that
our upgrades are completed cleanly.

Depends-On: I506ba4fc6b134ef0b389a2647fe22ae6b1a17ace
Change-Id: I98ca698478e24b65b52b2b3b10052532b8425976
---
 playbooks/os-nova-install.yml | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/playbooks/os-nova-install.yml b/playbooks/os-nova-install.yml
index aeb631c0c3..43dc68d015 100644
--- a/playbooks/os-nova-install.yml
+++ b/playbooks/os-nova-install.yml
@@ -16,39 +16,14 @@
 - name: Install nova-conductor services
   import_playbook: common-playbooks/nova.yml
   vars:
-    nova_hosts: "nova_conductor"
+    nova_hosts: "nova_conductor:nova_scheduler:nova_api_os_compute:nova_api_placement:nova_api_metadata:nova_console"
     nova_serial: "{{ nova_conductor_serial | default(['1', '100%']) }}"
 
 
-
-- name: Install nova-scheduler services
-  import_playbook: common-playbooks/nova.yml
-  vars:
-    nova_hosts: "nova_scheduler:!nova_conductor"
-    nova_serial: "{{ nova_scheduler_serial | default(['1', '100%']) }}"
-
-
-
-- name: Install nova API services
-  import_playbook: common-playbooks/nova.yml
-  vars:
-    nova_hosts: "nova_api_os_compute:nova_api_placement:!nova_conductor:!nova_scheduler:!nova_consoleauth"
-    nova_serial: "{{ nova_api_serial | default(['1', '100%']) }}"
-
-
-
-- name: Install nova console/metadata services
-  import_playbook: common-playbooks/nova.yml
-  vars:
-    nova_hosts: "nova_api_metadata:nova_console:!nova_conductor:!nova_scheduler:!nova_consoleauth:!nova_api_os_compute:!nova_api_placement"
-    nova_serial: "{{ nova_console_serial | default(['1', '100%']) }}"
-
-
-
 - name: Install nova compute
   import_playbook: common-playbooks/nova.yml
   vars:
-    nova_hosts: "nova_compute:!nova_conductor:!nova_scheduler:!nova_consoleauth:!nova_api_os_compute:!nova_api_placement:!nova_api_metadata:!nova_console"
+    nova_hosts: "nova_compute:!nova_conductor:!nova_scheduler:!nova_api_os_compute:!nova_api_placement:!nova_api_metadata:!nova_console"
     nova_serial: "{{ nova_compute_serial | default('100%') }}"