6e74844f72
To enable cold migration, need to update nova charts in openstack-helm and helm-toolkit chart in openstack-helm-infra. These changes build on existing upstream components which attempt to add a second container to the nova-compute pod which creates a sshd process listening on port 8022. Nova chart changes include: - Fix bug in ssh-config mapping so config file is generated properly in /root/.ssh/config in nova-compute container. - Move private key from sshd container to nova-compute container. - Map private and public ssh keys to new configmap-ssh which will default to acceptable file permissions (400) for ssh. Keys will be provided in overrides. - Add additional config to /etc/ssh/sshd_config to allow passwordless root logins over appropriate subnet passed in from overrides. This is the same as what is done in nova puppet currently. - Remove chmods from sshd bash script as they are failing. Function is replaced by configmap-ssh. To enable cold migration in nova helm chart, we need to allow multiple containers within the same daemonset pod. This requires a patch to the helm-toolkit _daemonset_overrides template to remove upstream restriction. This issue is tracked upstream by storyboard 2003876. These changes should be upstreamed but may require further refinement. Story: 2003909 Task: 28927 Change-Id: Id789ba051cec019e8b7564c713cf1b5296ecf9f6 Signed-off-by: Gerry Kopec <Gerry.Kopec@windriver.com>
36 lines
1.7 KiB
Diff
36 lines
1.7 KiB
Diff
From 26844aac43f76afc65ed907fc94ab83ca93c86ae Mon Sep 17 00:00:00 2001
|
|
From: Gerry Kopec <Gerry.Kopec@windriver.com>
|
|
Date: Wed, 9 Jan 2019 20:11:33 -0500
|
|
Subject: [PATCH] Allow multiple containers per daemonset pod
|
|
|
|
Remove code that restricted daemonset pods to single containers.
|
|
Container names will default to name from helm chart template without
|
|
hostname and sha though the pod will still have them.
|
|
|
|
May require further refinement before this can be upstreamed.
|
|
---
|
|
helm-toolkit/templates/utils/_daemonset_overrides.tpl | 7 -------
|
|
1 file changed, 7 deletions(-)
|
|
|
|
diff --git a/helm-toolkit/templates/utils/_daemonset_overrides.tpl b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
|
|
index 8ba2241..b960a84 100644
|
|
--- a/helm-toolkit/templates/utils/_daemonset_overrides.tpl
|
|
+++ b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
|
|
@@ -217,13 +217,6 @@ limitations under the License.
|
|
{{- if not $context.Values.__daemonset_yaml.metadata.name }}{{- $_ := set $context.Values.__daemonset_yaml.metadata "name" dict }}{{- end }}
|
|
{{- $_ := set $context.Values.__daemonset_yaml.metadata "name" $current_dict.dns_1123_name }}
|
|
|
|
- {{/* set container name
|
|
- assume not more than one container is defined */}}
|
|
- {{- $container := first $context.Values.__daemonset_yaml.spec.template.spec.containers }}
|
|
- {{- $_ := set $container "name" $current_dict.dns_1123_name }}
|
|
- {{- $cont_list := list $container }}
|
|
- {{- $_ := set $context.Values.__daemonset_yaml.spec.template.spec "containers" $cont_list }}
|
|
-
|
|
{{/* cross-reference configmap name to container volume definitions */}}
|
|
{{- $_ := set $context.Values "__volume_list" list }}
|
|
{{- range $current_volume := $context.Values.__daemonset_yaml.spec.template.spec.volumes }}
|
|
--
|
|
1.8.3.1
|
|
|