From c90df9d6d5082258090fd0b7e9ea0c2b6dc2920b Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Sat, 15 Dec 2018 18:42:46 -0600
Subject: [PATCH] Neutron: Perform full db migrations when TaaS enabled

This PS fixes the neutron db sync job to perform full db migrations
in addaion to tap-as-a-service when enabled.

Change-Id: Ieab54649344fb8737e2d8855f00a9ed574ace5ee
Signed-off-by: Pete Birley <pete@port.direct>
---
 neutron/templates/bin/_db-sync.sh.tpl | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/neutron/templates/bin/_db-sync.sh.tpl b/neutron/templates/bin/_db-sync.sh.tpl
index f8704c0730..16c41893f5 100644
--- a/neutron/templates/bin/_db-sync.sh.tpl
+++ b/neutron/templates/bin/_db-sync.sh.tpl
@@ -21,7 +21,12 @@ set -ex
 neutron-db-manage \
   --config-file /etc/neutron/neutron.conf \
   --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \
-{{- if .Values.conf.plugins.taas.taas.enabled }}
-  --subproject tap-as-a-service \
-{{- end }}
   upgrade head
+
+{{- if .Values.conf.plugins.taas.taas.enabled }}
+neutron-db-manage \
+  --config-file /etc/neutron/neutron.conf \
+  --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \
+  --subproject tap-as-a-service \
+  upgrade head
+{{- end }}