Merge "Add initcontainer to heat"

devstack/lib/heat

@@ -219,10 +219,6 @@ function init_heat {
     if is_service_enabled $DATABASE_BACKENDS; then
         # (re)create heat database
         recreate_database heat
-
-		time_start "dbsync"
-		sudo docker run -v $HEAT_CONF_DIR:$HEAT_CONF_DIR vexxhost/heat-engine:latest heat-manage db_sync
-		time_stop "dbsync"
     fi
 }
 

openstack_operator/templates/heat/deployment.yml.j2

@@ -28,6 +28,11 @@ metadata:
     {{ labels("heat", name, component) | indent(4) }}
 spec:
   replicas: 3
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
   selector:
     matchLabels:
       {{ labels("heat", name, component) | indent(6) }}
@@ -38,6 +43,18 @@ spec:
       annotations:
         checksum/config: "{{ config_hash }}"
     spec:
+      {% if 'engine' in component %}
+      initContainers:
+      - name: db-sync
+        image: vexxhost/heat-{{ component }}:latest
+        imagePullPolicy: Always
+        command:
+        - heat-manage
+        - db_sync
+        volumeMounts:
+        - mountPath: /etc/heat
+          name: config
+      {% endif %}
       containers:
       - name: heat-{{ component }}
         image: vexxhost/heat-{{ component }}:latest