From d0db7e00e81003945eeae3cd4f56e1153faf73b5 Mon Sep 17 00:00:00 2001
From: Carlos Camacho <ccamacho@redhat.com>
Date: Thu, 5 Jul 2018 16:16:56 +0200
Subject: [PATCH] FFU Create cell0 db points to the nova-api bootstrap node.

In case the nova-api service is not running in the MySQL
master node, the FFU tasks will fail as it might not have
MySQL installed.

Avoid executing Nova DB tasks on FFU if MySQL not installed,
point to the MySQL server.

Resolves: rhbz#1593910
Closes-bug: 1780425

Change-Id: I02bc48d535707d579ecd590f970b1a08962a0111
(cherry picked from commit 00ed1a2d39fcbf73fd0ecc9ca8fd1dfe1cffdd6f)
---
 docker/services/database/mysql.yaml           | 16 ++++++++++++++++
 docker/services/nova-api.yaml                 | 12 ------------
 docker/services/pacemaker/database/mysql.yaml | 16 ++++++++++++++++
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml
index 18b88987dc..9cfd4b6293 100644
--- a/docker/services/database/mysql.yaml
+++ b/docker/services/database/mysql.yaml
@@ -254,3 +254,19 @@ outputs:
         - name: Check and upgrade Mysql database after major version upgrade
           command: docker exec -u root mysql mysql_upgrade
           when: step|int == 2
+      fast_forward_upgrade_tasks:
+        - when:
+            - step|int == 6
+            - release == 'ocata'
+            - is_bootstrap_node|bool
+          block:
+            - name: Create cell0 db
+              mysql_db:
+                name: nova_cell0
+                state: present
+            - name: Grant access to cell0 db
+              mysql_user:
+                name: nova
+                host_all: yes
+                state: present
+                priv: '*.*:ALL'
diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml
index 24aa371001..793b7e2278 100644
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@@ -408,18 +408,6 @@ outputs:
             - release == 'ocata'
             - is_bootstrap_node|bool
           block:
-            - name: Create cell0 db
-              mysql_db:
-                name: nova_cell0
-                state: present
-
-            - name: Grant access to cell0 db
-              mysql_user:
-                name: nova
-                host_all: yes
-                state: present
-                priv: '*.*:ALL'
-
             - name: Create puppet manifest to set transport_url in nova.conf
               copy:
                 dest: /root/nova-api_upgrade_manifest.pp
diff --git a/docker/services/pacemaker/database/mysql.yaml b/docker/services/pacemaker/database/mysql.yaml
index dcc38f1730..52f7dbbb9a 100644
--- a/docker/services/pacemaker/database/mysql.yaml
+++ b/docker/services/pacemaker/database/mysql.yaml
@@ -505,3 +505,19 @@ outputs:
             - name: Upgrade Mysql database from the host
               shell: /bin/bash -ecx "{{mysql_upgrade_script}}"
               when: not mysql_containerized|bool
+      fast_forward_upgrade_tasks:
+        - when:
+            - step|int == 6
+            - release == 'ocata'
+            - is_bootstrap_node|bool
+          block:
+            - name: Create cell0 db
+              mysql_db:
+                name: nova_cell0
+                state: present
+            - name: Grant access to cell0 db
+              mysql_user:
+                name: nova
+                host_all: yes
+                state: present
+                priv: '*.*:ALL'