From 65b758330862df75f7ed2ddceb7debb89ce792a6 Mon Sep 17 00:00:00 2001
From: Lee Yarwood <lyarwood@redhat.com>
Date: Fri, 8 Jun 2018 16:04:14 +0100
Subject: [PATCH] ffu: Add missing nova-manage db sync for Pike upgrade

This would result in the failure of the online_data_migrations command
during the Ocata to Pike upgrade. The following Pike to Queens upgrade
would hide this failure by running both the sync and migrations again.

Change-Id: I51f40254acee435ed4e60c0e97b5ced86fd67fc2
Closes-bug: #1775868
---
 docker/services/nova-api.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml
index 19243f7049..ca2dc4e63f 100644
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@@ -485,6 +485,14 @@ outputs:
               command: nova-manage cell_v2 discover_hosts --cell_uuid {{nova_api_cell_uuid.stdout}} --verbose
             - name: Setup cell_v2 (migrate instances)
               command: nova-manage cell_v2 map_instances --cell_uuid {{nova_api_cell_uuid.stdout}}
+        - name: Sync nova/cell DB
+          command: nova-manage db sync
+          async: {get_param: NovaDbSyncTimeout}
+          poll: 10
+          when:
+            - step|int == 8
+            - is_bootstrap_node|bool
+            - release == 'pike'
         - name: Sync nova_api DB
           command: nova-manage api_db sync
           when: