openstack/openstack-helm
Code Issues Proposed changes

Merge "Refactor start scripts, to support graceful termination"

Browse Source
This commit is contained in:
Jenkins 2017-06-06 16:26:26 +00:00 committed by Gerrit Code Review
commit fa0bfeb0b5
38 changed files with 361 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
keystone/templates/bin/_start.sh.tpl → barbican/templates/bin/_babican.sh.tpl
View File

@ -15,11 +15,14 @@
# limitations under the License.
set -ex
COMMAND="${@:-start}"
if [ -f /etc/apache2/envvars ]; then
# Loading Apache2 ENV variables
source /etc/apache2/envvars
fi
function start () {
exec uwsgi --die-on-term --master --emperor /etc/barbican/vassals
}
# Start Apache2
exec apache2 -DFOREGROUND
function stop () {
kill -TERM 1
}
$COMMAND

4
barbican/templates/configmap-bin.yaml
View File

@ -19,8 +19,8 @@ data:
{{- include "helm-toolkit.scripts.db_init" . | indent 4 }}
db-sync.sh: |
{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
start.sh: |
{{ tuple "bin/_start.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
barbican.sh: |
{{ tuple "bin/_barbican.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
ks-service.sh: |
{{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }}
ks-endpoints.sh: |

14
barbican/templates/deployment-api.yaml
View File

@ -56,7 +56,15 @@ spec:
{{- end }}
command:
- bash
- /tmp/start.sh
- /tmp/barbican.sh
- start
lifecycle:
preStop:
exec:
command:
- bash
- /tmp/barbican.sh
- stop
ports:
- containerPort: {{ .Values.conf.barbican.barbican_api.barbican.config.bind_port }}
readinessProbe:
@ -86,8 +94,8 @@ spec:
subPath: policy.json
readOnly: true
- name: barbican-bin
mountPath: /tmp/start.sh
subPath: start.sh
mountPath: /tmp/barbican.sh
subPath: barbican.sh
readOnly: true
{{ if $mounts_barbican_api.volumeMounts }}{{ toYaml $mounts_barbican_api.volumeMounts | indent 12 }}{{ end }}
volumes:

16
cinder/templates/bin/_cinder-api.sh.tpl
View File

@ -14,6 +14,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
set -x
exec cinder-api \
--config-file /etc/cinder/cinder.conf
set -ex
COMMAND="${@:-start}"
function start () {
exec cinder-api \
--config-file /etc/cinder/cinder.conf
}
function stop () {
kill -TERM 1
}
$COMMAND

2
cinder/templates/bin/_cinder-scheduler.sh.tpl
View File

@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
set -x
set -ex
exec cinder-scheduler \
--config-file /etc/cinder/cinder.conf

2
cinder/templates/bin/_cinder-volume.sh.tpl
View File

@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
set -x
set -ex
exec cinder-volume \
--config-file /etc/cinder/cinder.conf

2
cinder/templates/bin/_db-sync.sh.tpl
View File

@ -16,4 +16,4 @@
set -ex
cinder-manage db sync
exec cinder-manage db sync

13
cinder/templates/deployment-api.yaml
View File

@ -60,16 +60,17 @@ spec:
command:
- bash
- /tmp/cinder-api.sh
ports:
- name: c-api
containerPort: {{ .Values.conf.cinder.default.cinder.osapi_volume_listen_port }}
- start
lifecycle:
preStop:
exec:
command:
- kill
- -TERM
- "1"
- bash
- /tmp/cinder-api.sh
- stop
ports:
- name: c-api
containerPort: {{ .Values.conf.cinder.default.cinder.osapi_volume_listen_port }}
readinessProbe:
tcpSocket:
port: {{ .Values.conf.cinder.default.cinder.osapi_volume_listen_port }}

16
glance/templates/bin/_glance-api.sh.tpl
View File

@ -14,6 +14,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
set -x
exec glance-api \
--config-file /etc/glance/glance-api.conf
set -ex
COMMAND="${@:-start}"
function start () {
exec glance-api \
--config-file /etc/glance/glance-api.conf
}
function stop () {
kill -TERM 1
}
$COMMAND

16
glance/templates/bin/_glance-registry.sh.tpl
View File

@ -14,6 +14,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
set -x
exec glance-registry \
--config-file /etc/glance/glance-registry.conf
set -ex
COMMAND="${@:-start}"
function start () {
exec glance-registry \
--config-file /etc/glance/glance-registry.conf
}
function stop () {
kill -TERM 1
}
$COMMAND

11
glance/templates/deployment-api.yaml
View File

@ -60,15 +60,16 @@ spec:
command:
- bash
- /tmp/glance-api.sh
ports:
- containerPort: {{ .Values.conf.glance.default.glance.api.bind_port }}
- start
lifecycle:
preStop:
exec:
command:
- kill
- -TERM
- "1"
- bash
- /tmp/glance-api.sh
- stop
ports:
- containerPort: {{ .Values.conf.glance.default.glance.api.bind_port }}
readinessProbe:
tcpSocket:
port: {{ .Values.conf.glance.default.glance.api.bind_port }}

11
glance/templates/deployment-registry.yaml
View File

@ -52,15 +52,16 @@ spec:
command:
- bash
- /tmp/glance-registry.sh
ports:
- containerPort: {{ .Values.conf.glance_registry.default.glance.registry.bind_port }}
- start
lifecycle:
preStop:
exec:
command:
- kill
- -TERM
- "1"
- bash
- /tmp/glance-registry.sh
- stop
ports:
- containerPort: {{ .Values.conf.glance_registry.default.glance.registry.bind_port }}
readinessProbe:
tcpSocket:
port: {{ .Values.conf.glance_registry.default.glance.registry.bind_port }}

16
heat/templates/bin/_heat-api.sh.tpl
View File

@ -14,6 +14,16 @@
# 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
set -ex
COMMAND="${@:-start}"
function start () {
exec heat-api \
--config-file /etc/heat/heat.conf
}
function stop () {
kill -TERM 1
}
$COMMAND

16
heat/templates/bin/_heat-cfn.sh.tpl
View File

@ -14,6 +14,16 @@
# 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
set -ex
COMMAND="${@:-start}"
function start () {
exec heat-api-cfn \
--config-file /etc/heat/heat.conf
}
function stop () {
kill -TERM 1
}
$COMMAND

16
heat/templates/bin/_heat-cloudwatch.sh.tpl
View File

@ -14,6 +14,16 @@
# 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
set -ex
COMMAND="${@:-start}"
function start () {
exec heat-api-cloudwatch \
--config-file /etc/heat/heat.conf
}
function stop () {
kill -TERM 1
}
$COMMAND

11
heat/templates/deployment-api.yaml
View File

@ -60,15 +60,16 @@ spec:
command:
- bash
- /tmp/heat-api.sh
ports:
- containerPort: {{ .Values.conf.heat.heat_api.heat.common.wsgi.bind_port }}
- start
lifecycle:
preStop:
exec:
command:
- kill
- -TERM
- "1"
- bash
- /tmp/heat-api.sh
- stop
ports:
- containerPort: {{ .Values.conf.heat.heat_api.heat.common.wsgi.bind_port }}
readinessProbe:
tcpSocket:
port: {{ .Values.conf.heat.heat_api.heat.common.wsgi.bind_port }}

11
heat/templates/deployment-cfn.yaml
View File

@ -60,15 +60,16 @@ spec:
command:
- bash
- /tmp/heat-cfn.sh
ports:
- containerPort: {{ .Values.conf.heat.heat_api_cfn.heat.common.wsgi.bind_port }}
- start
lifecycle:
preStop:
exec:
command:
- kill
- -TERM
- "1"
- bash
- /tmp/heat-cfn.sh
- stop
ports:
- containerPort: {{ .Values.conf.heat.heat_api_cfn.heat.common.wsgi.bind_port }}
readinessProbe:
tcpSocket:
port: {{ .Values.conf.heat.heat_api_cfn.heat.common.wsgi.bind_port }}

11
heat/templates/deployment-cloudwatch.yaml
View File

@ -60,15 +60,16 @@ spec:
command:
- bash
- /tmp/heat-cloudwatch.sh
ports:
- containerPort: {{ .Values.conf.heat.heat_api_cloudwatch.heat.common.wsgi.bind_port }}
- start
lifecycle:
preStop:
exec:
command:
- kill
- -TERM
- "1"
- bash
- /tmp/heat-cloudwatch.sh
- stop
ports:
- containerPort: {{ .Values.conf.heat.heat_api_cloudwatch.heat.common.wsgi.bind_port }}
readinessProbe:
tcpSocket:
port: {{ .Values.conf.heat.heat_api_cloudwatch.heat.common.wsgi.bind_port }}

43
horizon/templates/bin/_horizon.sh.tpl Normal file
View File

@ -0,0 +1,43 @@
#!/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 -ex
COMMAND="${@:-start}"
function start () {
if [ -f /etc/apache2/envvars ]; then
# Loading Apache2 ENV variables
source /etc/apache2/envvars
fi
rm -rf /var/run/apache2/*
APACHE_DIR="apache2"
# Compress Horizon's assets.
/var/lib/kolla/venv/bin/manage.py collectstatic --noinput
/var/lib/kolla/venv/bin/manage.py compress --force
rm -rf /tmp/_tmp_.secret_key_store.lock /tmp/.secret_key_store
# wsgi/horizon-http needs open files here, including secret_key_store
chown -R horizon /var/lib/kolla/venv/lib/python2.7/site-packages/openstack_dashboard/local/
exec apache2 -DFOREGROUND
}
function stop () {
apachectl -k graceful-stop
}
$COMMAND

33
horizon/templates/bin/_start.sh.tpl
View File

@ -1,33 +0,0 @@
#!/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 -ex
# Loading Apache2 ENV variables
source /etc/apache2/envvars
rm -rf /var/run/apache2/*
APACHE_DIR="apache2"
# Compress Horizon's assets.
/var/lib/kolla/venv/bin/manage.py collectstatic --noinput
/var/lib/kolla/venv/bin/manage.py compress --force
rm -rf /tmp/_tmp_.secret_key_store.lock /tmp/.secret_key_store
# wsgi/horizon-http needs open files here, including secret_key_store
chown -R horizon /var/lib/kolla/venv/lib/python2.7/site-packages/openstack_dashboard/local/
apache2 -DFOREGROUND

4
horizon/templates/configmap-bin.yaml
View File

@ -17,5 +17,5 @@ kind: ConfigMap
metadata:
name: horizon-bin
data:
start.sh: |
{{ tuple "bin/_start.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
horizon.sh: |
{{ tuple "bin/_horizon.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}

17
horizon/templates/deployment.yaml
View File

@ -59,23 +59,24 @@ spec:
{{- end }}
command:
- bash
- /tmp/start.sh
ports:
- containerPort: {{ .Values.network.port }}
- /tmp/horizon.sh
- start
lifecycle:
preStop:
exec:
command:
- apachectl
- -k
- graceful-stop
- bash
- /tmp/horizon.sh
- stop
ports:
- containerPort: {{ .Values.network.port }}
readinessProbe:
tcpSocket:
port: {{ .Values.network.port }}
volumeMounts:
- name: startsh
mountPath: /tmp/start.sh
subPath: start.sh
mountPath: /tmp/horizon.sh
subPath: horizon.sh
readOnly: true
- name: horizon-etc
mountPath: /etc/apache2/sites-enabled/000-default.conf

18
barbican/templates/bin/_start.sh.tpl → keystone/templates/bin/_keystone-api.sh.tpl
View File

@ -16,4 +16,20 @@
set -ex
exec uwsgi --master --emperor /etc/barbican/vassals
COMMAND="${@:-start}"
function start () {
if [ -f /etc/apache2/envvars ]; then
# Loading Apache2 ENV variables
source /etc/apache2/envvars
fi
# Start Apache2
exec apache2 -DFOREGROUND
}
function stop () {
apachectl -k graceful-stop
}
$COMMAND

4
keystone/templates/configmap-bin.yaml
View File

@ -21,5 +21,5 @@ data:
{{- include "helm-toolkit.scripts.db_init" . | indent 4 }}
db-sync.sh: |
{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
start.sh: |
{{ tuple "bin/_start.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
keystone-api.sh: |
{{ tuple "bin/_keystone-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}

21
keystone/templates/deployment.yaml
View File

@ -59,19 +59,20 @@ spec:
{{- end }}
command:
- bash
- /tmp/start.sh
- /tmp/keystone-api.sh
- start
lifecycle:
preStop:
exec:
command:
- bash
- /tmp/keystone-api.sh
- stop
ports:
- name: api-public
containerPort: {{ .Values.network.api.port }}
- name: api-admin
containerPort: {{ .Values.network.admin.port }}
lifecycle:
preStop:
exec:
command:
- apachectl
- -k
- graceful-stop
readinessProbe:
tcpSocket:
port: {{ .Values.network.api.port }}
@ -103,8 +104,8 @@ spec:
subPath: mpm_event.conf
readOnly: true
- name: keystone-bin
mountPath: /tmp/start.sh
subPath: start.sh
mountPath: /tmp/keystone-api.sh
subPath: keystone-api.sh
readOnly: true
{{ if $mounts_keystone_api.volumeMounts }}{{ toYaml $mounts_keystone_api.volumeMounts | indent 10 }}{{ end }}
volumes:

16
magnum/templates/bin/_magnum-api.sh.tpl
View File

@ -14,6 +14,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
set -x
exec magnum-api \
--config-file /etc/magnum/magnum.conf
set -ex
COMMAND="${@:-start}"
function start () {
exec magnum-api \
--config-file /etc/magnum/magnum.conf
}
function stop () {
kill -TERM 1
}
$COMMAND

2
magnum/templates/bin/_magnum-conductor.sh.tpl
View File

@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
set -x
set -ex
exec magnum-conductor \
--config-file /etc/magnum/magnum.conf

17
magnum/templates/deployment-api.yaml
View File

@ -57,21 +57,22 @@ spec:
memory: {{ .Values.resources.magnum_api.limits.memory | quote }}
cpu: {{ .Values.resources.magnum_api.limits.cpu | quote }}
{{- end }}
ports:
- containerPort: {{ .Values.conf.magnum.api.magnum.port }}
command:
- bash
- /tmp/magnum-api.sh
- start
lifecycle:
preStop:
exec:
command:
- kill
- -TERM
- "1"
- bash
- /tmp/magnum-api.sh
- stop
ports:
- containerPort: {{ .Values.conf.magnum.api.magnum.port }}
readinessProbe:
tcpSocket:
port: {{ .Values.conf.magnum.api.magnum.port }}
command:
- bash
- /tmp/magnum-api.sh
volumeMounts:
- name: magnum-bin
mountPath: /tmp/magnum-api.sh

18
mistral/templates/bin/_mistral-api.sh.tpl
View File

@ -14,7 +14,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
set -x
exec mistral-server \
--server api \
--config-file /etc/mistral/mistral.conf
set -ex
COMMAND="${@:-start}"
function start () {
exec mistral-server \
--server api \
--config-file /etc/mistral/mistral.conf
}
function stop () {
kill -TERM 1
}
$COMMAND

13
mistral/templates/deployment-api.yaml
View File

@ -60,16 +60,17 @@ spec:
command:
- bash
- /tmp/mistral-api.sh
ports:
- name: {{ .Values.network.api.name }}
containerPort: {{ .Values.conf.mistral.api.mistral.config.port }}
- start
lifecycle:
preStop:
exec:
command:
- kill
- -TERM
- "1"
- bash
- /tmp/mistral-api.sh
- stop
ports:
- name: {{ .Values.network.api.name }}
containerPort: {{ .Values.conf.mistral.api.mistral.config.port }}
readinessProbe:
tcpSocket:
port: {{ .Values.conf.mistral.api.mistral.config.port }}

18
neutron/templates/bin/_neutron-server.sh.tpl
View File

@ -14,7 +14,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
set -x
exec neutron-server \
--config-file /etc/neutron/neutron.conf \
--config-file /etc/neutron/plugins/ml2/ml2_conf.ini
set -ex
COMMAND="${@:-start}"
function start () {
exec neutron-server \
--config-file /etc/neutron/neutron.conf \
--config-file /etc/neutron/plugins/ml2/ml2_conf.ini
}
function stop () {
kill -TERM 1
}
$COMMAND

17
neutron/templates/deployment-server.yaml
View File

@ -57,21 +57,22 @@ spec:
cpu: {{ .Values.resources.server.requests.cpu | quote }}
memory: {{ .Values.resources.server.requests.memory | quote }}
{{- end }}
ports:
- containerPort: {{ .Values.network.server.port }}
command:
- bash
- /tmp/neutron-server.sh
- start
lifecycle:
preStop:
exec:
command:
- kill
- -TERM
- "1"
- bash
- /tmp/neutron-server.sh
- stop
ports:
- containerPort: {{ .Values.network.server.port }}
readinessProbe:
tcpSocket:
port: {{ .Values.network.server.port }}
command:
- bash
- /tmp/neutron-server.sh
volumeMounts:
- name: neutron-bin
mountPath: /tmp/neutron-server.sh

16
nova/templates/bin/_nova-api-metadata.sh.tpl
View File

@ -14,6 +14,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
set -x
exec nova-api-metadata \
--config-file /etc/nova/nova.conf
set -ex
COMMAND="${@:-start}"
function start () {
exec nova-api-metadata \
--config-file /etc/nova/nova.conf
}
function stop () {
kill -TERM 1
}
$COMMAND

16
nova/templates/bin/_nova-api.sh.tpl
View File

@ -14,6 +14,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
set -x
exec nova-api \
--config-file /etc/nova/nova.conf
set -ex
COMMAND="${@:-start}"
function start () {
exec nova-api-os-compute \
--config-file /etc/nova/nova.conf
}
function stop () {
kill -TERM 1
}
$COMMAND

20
nova/templates/deployment-api-metadata.yaml
View File

@ -48,7 +48,6 @@ spec:
- name: nova-api
image: {{ .Values.images.api }}
imagePullPolicy: {{ .Values.images.pull_policy }}
# https://bugs.launchpad.net/kolla-mesos/+bug/1546007
{{- if .Values.resources.enabled }}
resources:
requests:
@ -58,25 +57,28 @@ spec:
memory: {{ .Values.resources.nova_api_metadata.limits.memory | quote }}
cpu: {{ .Values.resources.nova_api_metadata.limits.cpu | quote }}
{{- end }}
# NOTE(portdirect): NET_ADMIN is needed as the api-metadata service
# expects to run some iptables commands, even when neutron is used.
securityContext:
capabilities:
add:
- NET_ADMIN
ports:
- containerPort: {{ .Values.network.metadata.port }}
command:
- bash
- /tmp/nova-api-metadata.sh
- start
lifecycle:
preStop:
exec:
command:
- kill
- -TERM
- "1"
- bash
- /tmp/nova-api-metadata.sh
- stop
ports:
- containerPort: {{ .Values.network.metadata.port }}
readinessProbe:
tcpSocket:
port: {{ .Values.network.metadata.port }}
command:
- bash
- /tmp/nova-api-metadata.sh
volumeMounts:
- name: nova-bin
mountPath: /tmp/nova-api-metadata.sh

21
nova/templates/deployment-api-osapi.yaml
View File

@ -48,10 +48,6 @@ spec:
- name: nova-osapi
image: {{ .Values.images.api }}
imagePullPolicy: {{ .Values.images.pull_policy }}
securityContext:
capabilities:
add:
- NET_ADMIN
{{- if .Values.resources.enabled }}
resources:
requests:
@ -61,21 +57,22 @@ spec:
memory: {{ .Values.resources.nova_osapi.limits.memory | quote }}
cpu: {{ .Values.resources.nova_osapi.limits.cpu | quote }}
{{- end }}
ports:
- containerPort: {{ .Values.network.osapi.port }}
command:
- bash
- /tmp/nova-api.sh
- start
lifecycle:
preStop:
exec:
command:
- kill
- -TERM
- "1"
- bash
- /tmp/nova-api.sh
- stop
ports:
- containerPort: {{ .Values.network.osapi.port }}
readinessProbe:
tcpSocket:
port: {{ .Values.network.osapi.port }}
command:
- bash
- /tmp/nova-api.sh
volumeMounts:
- name: nova-bin
mountPath: /tmp/nova-api.sh

16
senlin/templates/bin/_senlin-api.sh.tpl
View File

@ -14,6 +14,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
set -x
exec senlin-api \
--config-file /etc/senlin/senlin.conf
set -ex
COMMAND="${@:-start}"
function start () {
exec senlin-api \
--config-file /etc/senlin/senlin.conf
}
function stop () {
kill -TERM 1
}
$COMMAND

21
senlin/templates/deployment-api.yaml
View File

@ -57,21 +57,22 @@ spec:
memory: {{ .Values.resources.senlin_api.limits.memory | quote }}
cpu: {{ .Values.resources.senlin_api.limits.cpu | quote }}
{{- end }}
command:
- bash
- /tmp/senlin-api.sh
- start
lifecycle:
preStop:
exec:
command:
- bash
- /tmp/senlin-api.sh
- stop
ports:
- containerPort: {{ .Values.conf.senlin.senlin_api.senlin.config.bind_port }}
readinessProbe:
tcpSocket:
port: {{ .Values.conf.senlin.senlin_api.senlin.config.bind_port }}
command:
- bash
- /tmp/senlin-api.sh
lifecycle:
preStop:
exec:
command:
- kill
- -TERM
- "1"
volumeMounts:
- name: senlin-bin
mountPath: /tmp/senlin-api.sh