openstack
/
kolla-kubernetes
Code Issues Proposed changes

Allow overriding images for ironic pods with multiple containers 

In order to allow an operator to override specific container images
inside the ironic pods that run multiple containers, we need to
prefix their image lookup information so that they don't conflict with
the main container image running in that pod.

Change-Id: I76c9052e2dddd32b760a92f18aee932f33228287
This commit is contained in:
Sam Betts 2017-05-31 14:23:36 +01:00
parent dc9762cf0a
commit fe3e705064
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
helm/microservice/ironic-conductor-daemonset/templates/ironic-conductor.yaml
View File

@ -12,8 +12,8 @@
{{- $imageFull := include "kolla_build_image_full" $c }}
{{- $c := dict "searchPath" $searchPath "Values" .Values }}
{{- $_ := set $c "contName" "ironic-pxe" }}
{{- $_ := set $c "imageName" "image_full" }}
{{- $_ := set $c "tagName" "image_tag" }}
{{- $_ := set $c "imageName" "ironic_pxe_image_full" }}
{{- $_ := set $c "tagName" "ironic_pxe_image_tag" }}
{{- $imageFullPXE := include "kolla_build_image_full" $c }}
{{- $imagePullPolicy := include "kolla_val_get_str" (dict "key" "image_pull_policy" "searchPath" $searchPath "Values" .Values ) }}
{{- $containerConfigDirectory := include "kolla_val_get_str" (dict "key" "container_config_directory" "searchPath" $searchPath "Values" .Values ) }}

8
helm/microservice/ironic-inspector-deployment/templates/ironic-inspector.yaml
View File

@ -14,13 +14,13 @@
{{- $privileged := true }}
{{- $c := dict "searchPath" $searchPath "Values" .Values }}
{{- $_ := set $c "contName" "dnsmasq" }}
{{- $_ := set $c "imageName" "image_full" }}
{{- $_ := set $c "tagName" "image_tag" }}
{{- $_ := set $c "imageName" "dnsmasq_image_full" }}
{{- $_ := set $c "tagName" "dnsmasq_image_tag" }}
{{- $imageFullDnsmasq := include "kolla_build_image_full" $c }}
{{- $c := dict "searchPath" $searchPath "Values" .Values }}
{{- $_ := set $c "contName" "ironic-pxe" }}
{{- $_ := set $c "imageName" "image_full" }}
{{- $_ := set $c "tagName" "image_tag" }}
{{- $_ := set $c "imageName" "ironic_pxe_image_full" }}
{{- $_ := set $c "tagName" "ironic_pxe_image_tag" }}
{{- $imageFullPXE := include "kolla_build_image_full" $c }}
{{- $c := dict "searchPath" $searchPath "Values" .Values }}
{{- $_ := set $c "contName" "ironic-inspector" }}