Merge "Consistency: Move Heat container start commands to scripts"

heat/templates/bin/_heat-api.sh.tpl

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Copyright 2017 The Openstack-Helm Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -x
+exec heat-api \
+      --config-file /etc/heat/heat.conf

heat/templates/bin/_heat-cfn.sh.tpl

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Copyright 2017 The Openstack-Helm Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -x
+exec heat-api-cfn \
+      --config-file /etc/heat/heat.conf

heat/templates/bin/_heat-cloudwatch.sh.tpl

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Copyright 2017 The Openstack-Helm Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -x
+exec heat-api-cloudwatch \
+      --config-file /etc/heat/heat.conf

heat/templates/bin/_heat-engine.sh.tpl

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Copyright 2017 The Openstack-Helm Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -x
+exec heat-engine \
+      --config-file /etc/heat/heat.conf

heat/templates/configmap-bin.yaml

@@ -29,3 +29,11 @@ data:
 {{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }}
   ks-domain-user.sh: |+
 {{- include "helm-toolkit.scripts.keystone_domain_user" . | indent 4 }}
+  heat-api.sh: |
+{{ tuple "bin/_heat-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
+  heat-cfn.sh: |
+{{ tuple "bin/_heat-cfn.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
+  heat-cloudwatch.sh: |
+{{ tuple "bin/_heat-cloudwatch.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
+  heat-engine.sh: |
+{{ tuple "bin/_heat-engine.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}

heat/templates/deployment-api.yaml

@@ -57,9 +57,8 @@ spec:
               cpu: {{ .Values.resources.heat_api.limits.cpu | quote }}
           {{- end }}
           command:
-            - heat-api
+            - bash
-            - --config-dir
+            - /tmp/heat-api.sh
-            - /etc/heat
           ports:
             - containerPort: {{ .Values.conf.heat.heat_api.heat.common.wsgi.bind_port }}
           readinessProbe:
@@ -70,6 +69,10 @@ spec:
               mountPath: /etc/heat
             - name: pod-var-cache-heat
               mountPath: /var/cache/heat
+            - name: heat-bin
+              mountPath: /tmp/heat-api.sh
+              subPath: heat-api.sh
+              readOnly: true
             - name: heat-etc
               mountPath: /etc/heat/heat.conf
               subPath: heat.conf
@@ -88,6 +91,9 @@ spec:
           emptyDir: {}
         - name: pod-var-cache-heat
           emptyDir: {}
+        - name: heat-bin
+          configMap:
+            name: heat-bin
         - name: heat-etc
           configMap:
             name: heat-etc

heat/templates/deployment-cfn.yaml

@@ -57,9 +57,8 @@ spec:
               cpu: {{ .Values.resources.heat_cfn.limits.cpu | quote }}
           {{- end }}
           command:
-            - heat-api-cfn
+            - bash
-            - --config-dir
+            - /tmp/heat-cfn.sh
-            - /etc/heat
           ports:
             - containerPort: {{ .Values.conf.heat.heat_api_cfn.heat.common.wsgi.bind_port }}
           readinessProbe:
@@ -70,6 +69,10 @@ spec:
               mountPath: /etc/heat
             - name: pod-var-cache-heat
               mountPath: /var/cache/heat
+            - name: heat-bin
+              mountPath: /tmp/heat-cfn.sh
+              subPath: heat-cfn.sh
+              readOnly: true
             - name: heat-etc
               mountPath: /etc/heat/heat.conf
               subPath: heat.conf
@@ -88,6 +91,9 @@ spec:
           emptyDir: {}
         - name: pod-var-cache-heat
           emptyDir: {}
+        - name: heat-bin
+          configMap:
+            name: heat-bin
         - name: heat-etc
           configMap:
             name: heat-etc

heat/templates/deployment-cloudwatch.yaml

@@ -57,9 +57,8 @@ spec:
               cpu: {{ .Values.resources.heat_cloudwatch.limits.cpu | quote }}
           {{- end }}
           command:
-            - heat-api-cloudwatch
+            - bash
-            - --config-dir
+            - /tmp/heat-cloudwatch.sh
-            - /etc/heat
           ports:
             - containerPort: {{ .Values.conf.heat.heat_api_cloudwatch.heat.common.wsgi.bind_port }}
           readinessProbe:
@@ -70,6 +69,10 @@ spec:
               mountPath: /etc/heat
             - name: pod-var-cache-heat
               mountPath: /var/cache/heat
+            - name: heat-bin
+              mountPath: /tmp/heat-cloudwatch.sh
+              subPath: heat-cloudwatch.sh
+              readOnly: true
             - name: heat-etc
               mountPath: /etc/heat/heat.conf
               subPath: heat.conf
@@ -88,6 +91,9 @@ spec:
           emptyDir: {}
         - name: pod-var-cache-heat
           emptyDir: {}
+        - name: heat-bin
+          configMap:
+            name: heat-bin
         - name: heat-etc
           configMap:
             name: heat-etc

heat/templates/statefulset-engine.yaml

@@ -48,14 +48,17 @@ spec:
               cpu: {{ .Values.resources.heat_engine.limits.cpu | quote }}
           {{- end }}
           command:
-            - heat-engine
+            - bash
-            - --config-dir
+            - /tmp/heat-engine.sh
-            - /etc/heat
           volumeMounts:
             - name: pod-etc-heat
               mountPath: /etc/heat
             - name: pod-var-cache-heat
               mountPath: /var/cache/heat
+            - name: heat-bin
+              mountPath: /tmp/heat-engine.sh
+              subPath: heat-engine.sh
+              readOnly: true
             - name: heat-etc
               mountPath: /etc/heat/heat.conf
               subPath: heat.conf
@@ -70,6 +73,9 @@ spec:
           emptyDir: {}
         - name: pod-var-cache-heat
           emptyDir: {}
+        - name: heat-bin
+          configMap:
+            name: heat-bin
         - name: heat-etc
           configMap:
             name: heat-etc