From e9ae4bb3cac480540ac4d983532d38372d282cdf Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Thu, 19 Jan 2017 23:15:52 +0000
Subject: [PATCH] pull-policy-fix

---
 nova/templates/daemonset-compute.yaml      | 10 +++++-----
 nova/templates/daemonset-libvirt.yaml      |  8 ++++----
 nova/templates/deployment-api-osapi.yaml   |  6 +++---
 nova/templates/deployment-conductor.yaml   |  6 +++---
 nova/templates/deployment-consoleauth.yaml |  6 +++---
 nova/templates/deployment-scheduler.yaml   |  6 +++---
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml
index 0bbeed0ffe..2c2645760f 100644
--- a/nova/templates/daemonset-compute.yaml
+++ b/nova/templates/daemonset-compute.yaml
@@ -11,7 +11,7 @@ spec:
         app: nova-compute
       annotations:
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
-        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}        
+        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
         pod.beta.kubernetes.io/init-containers: '[
 {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
         ]'
@@ -26,7 +26,7 @@ spec:
       containers:
         - name: nova-compute
           image: {{ .Values.images.compute }}
-          imagePullPolicy: Always
+          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             privileged: true
           command:
@@ -87,7 +87,7 @@ spec:
         - name: cgroup
           hostPath:
             path: /sys/fs/cgroup
-        {{- if .Values.ceph.enabled }}            
+        {{- if .Values.ceph.enabled }}
         - name: cephconf
           configMap:
             name: nova-etc
@@ -99,5 +99,5 @@ spec:
             name: nova-etc
             items:
             - key: ceph.client.cinder.keyring.yaml
-              path: ceph.client.cinder.keyring.yaml     
-        {{- end }}       
+              path: ceph.client.cinder.keyring.yaml
+        {{- end }}
diff --git a/nova/templates/daemonset-libvirt.yaml b/nova/templates/daemonset-libvirt.yaml
index 01fad2387d..dd36e59d61 100644
--- a/nova/templates/daemonset-libvirt.yaml
+++ b/nova/templates/daemonset-libvirt.yaml
@@ -11,7 +11,7 @@ spec:
         app: nova-libvirt
       annotations:
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
-        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}        
+        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
         pod.beta.kubernetes.io/init-containers: '[
 {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
         ]'
@@ -25,7 +25,7 @@ spec:
       containers:
         - name: nova-libvirt
           image: {{ .Values.images.libvirt }}
-          imagePullPolicy: Always
+          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             privileged: true
           command:
@@ -58,7 +58,7 @@ spec:
               subPath: ceph.conf
             - name: cephclientcinderkeyring
               mountPath: /etc/ceph/ceph.client.{{ .Values.ceph.cinder_user }}.keyring
-              subPath: ceph.client.{{ .Values.ceph.cinder_user }}.keyring              
+              subPath: ceph.client.{{ .Values.ceph.cinder_user }}.keyring
             {{- end }}
       volumes:
         - name: libvirtdconf
@@ -107,4 +107,4 @@ spec:
             items:
             - key: ceph.client.cinder.keyring.yaml
               path: ceph.client.cinder.keyring.yaml
-          {{- end }}        
+          {{- end }}
diff --git a/nova/templates/deployment-api-osapi.yaml b/nova/templates/deployment-api-osapi.yaml
index 21b4de6e43..1394b646b8 100644
--- a/nova/templates/deployment-api-osapi.yaml
+++ b/nova/templates/deployment-api-osapi.yaml
@@ -13,14 +13,14 @@ spec:
     rollingUpdate:
       maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
       maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
-    {{ end }}  
+    {{ end }}
   template:
     metadata:
       labels:
         app: nova-osapi
       annotations:
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
-        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}        
+        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
         pod.beta.kubernetes.io/init-containers: '[
 {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
         ]'
@@ -30,7 +30,7 @@ spec:
       containers:
         - name: nova-osapi
           image: {{ .Values.images.api }}
-          imagePullPolicy: {{ .Values.image.pull_policy }}
+          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             capabilities:
               add:
diff --git a/nova/templates/deployment-conductor.yaml b/nova/templates/deployment-conductor.yaml
index 92976ce449..b38b9de81a 100644
--- a/nova/templates/deployment-conductor.yaml
+++ b/nova/templates/deployment-conductor.yaml
@@ -13,14 +13,14 @@ spec:
     rollingUpdate:
       maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
       maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
-    {{ end }}  
+    {{ end }}
   template:
     metadata:
       labels:
         app: nova-conductor
       annotations:
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
-        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}        
+        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
         pod.beta.kubernetes.io/init-containers: '[
 {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
         ]'
@@ -30,7 +30,7 @@ spec:
       containers:
         - name: nova-conductor
           image: {{ .Values.images.conductor }}
-          imagePullPolicy: {{ .Values.image.pull_policy }}
+          imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - nova-conductor
             - --config-file
diff --git a/nova/templates/deployment-consoleauth.yaml b/nova/templates/deployment-consoleauth.yaml
index 93db54fb75..0b49784224 100644
--- a/nova/templates/deployment-consoleauth.yaml
+++ b/nova/templates/deployment-consoleauth.yaml
@@ -13,14 +13,14 @@ spec:
     rollingUpdate:
       maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
       maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
-    {{ end }}  
+    {{ end }}
   template:
     metadata:
       labels:
         app: nova-consoleauth
       annotations:
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
-        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}        
+        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
         pod.beta.kubernetes.io/init-containers: '[
 {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
         ]'
@@ -30,7 +30,7 @@ spec:
       containers:
         - name: nova-consoleauth
           image: {{ .Values.images.consoleauth }}
-          imagePullPolicy: {{ .Values.image.pull_policy }}
+          imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - nova-consoleauth
             - --config-file
diff --git a/nova/templates/deployment-scheduler.yaml b/nova/templates/deployment-scheduler.yaml
index 634e85229d..20e75428d7 100644
--- a/nova/templates/deployment-scheduler.yaml
+++ b/nova/templates/deployment-scheduler.yaml
@@ -13,14 +13,14 @@ spec:
     rollingUpdate:
       maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
       maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
-    {{ end }}  
+    {{ end }}
   template:
     metadata:
       labels:
         app: nova-scheduler
       annotations:
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
-        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}        
+        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
         pod.beta.kubernetes.io/init-containers: '[
 {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
         ]'
@@ -30,7 +30,7 @@ spec:
       containers:
         - name: nova-scheduler
           image: {{ .Values.images.scheduler }}
-          imagePullPolicy: {{ .Values.image.pull_policy }}
+          imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - nova-scheduler
             - --config-file