From 1ca404cbc1499bba6b4d88d2eabfd94dfac10f89 Mon Sep 17 00:00:00 2001
From: Oliver Walsh <owalsh@redhat.com>
Date: Thu, 11 Jun 2020 12:36:16 +0100
Subject: [PATCH] Move nova online migrations to nova-conductor

With multi-cell we can have stacks with no nova-api so the nova database
operations must be coupled to nova-conductor, not nova-api.

Change-Id: I27aa62d00b77ca7ff61bb31c6f396f03e148a144
Closes-bug: #1883098
(cherry picked from commit 22df3dbcbb67c62dc725c5f76140a10278b4d27b)
---
 deployment/nova/nova-api-container-puppet.yaml       | 9 ---------
 deployment/nova/nova-conductor-container-puppet.yaml | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml
index fd42df054a..46eb118cb9 100644
--- a/deployment/nova/nova-api-container-puppet.yaml
+++ b/deployment/nova/nova-api-container-puppet.yaml
@@ -495,15 +495,6 @@ outputs:
             - step|int == 4
       host_prep_tasks: {get_attr: [NovaApiLogging, host_prep_tasks]}
       external_upgrade_tasks:
-        - when: step|int == 1
-          block:
-            - name: Online data migration for Nova
-              command: "{{ container_cli }} exec nova_api nova-manage db online_data_migrations"
-              delegate_to: "{{ groups['nova_api'][0] }}"
-              become: true
-              tags:
-                - online_upgrade
-                - online_upgrade_nova
         - when:
             - step|int == 1
           tags:
diff --git a/deployment/nova/nova-conductor-container-puppet.yaml b/deployment/nova/nova-conductor-container-puppet.yaml
index 359b3be6d1..61d81d1205 100644
--- a/deployment/nova/nova-conductor-container-puppet.yaml
+++ b/deployment/nova/nova-conductor-container-puppet.yaml
@@ -203,6 +203,15 @@ outputs:
                 persistent: yes
                 state: yes
       external_upgrade_tasks:
+        - when: step|int == 1
+          block:
+            - name: Online data migration for Nova
+              command: "{{ container_cli }} exec nova_conductor nova-manage db online_data_migrations"
+              delegate_to: "{{ groups['nova_conductor'][0] }}"
+              become: true
+              tags:
+                - online_upgrade
+                - online_upgrade_nova
         - when:
             - step|int == 1
           tags: