openstack/openstack-helm
Code Issues Proposed changes

Merge "Remove trailing whitespace from Nova Chart"

Browse Source
This commit is contained in:
Jenkins 2017-04-12 12:55:59 +00:00 committed by Gerrit Code Review
commit adf574918b
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,14 +29,14 @@ spec:
rollingUpdate:
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
{{ end }}
{{ end }}
template:
metadata:
labels:
app: nova-api-metadata
annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependencies $mounts_nova_api_metadata_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
]'
@ -77,5 +77,5 @@ spec:
volumes:
- name: nova-etc
configMap:
name: nova-etc
name: nova-etc
{{ if $mounts_nova_api_metadata.volumes }}{{ toYaml $mounts_nova_api_metadata.volumes | indent 8 }}{{ end }}

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

@ -71,10 +71,10 @@ spec:
volumeMounts:
- name: nova-etc
mountPath: /etc/nova/nova.conf
subPath: nova.conf
subPath: nova.conf
{{ if $mounts_nova_api_osapi.volumeMounts }}{{ toYaml $mounts_nova_api_osapi.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: nova-etc
configMap:
name: nova-etc
name: nova-etc
{{ if $mounts_nova_api_osapi.volumes}}{{ toYaml $mounts_nova_api_osapi.volumes | indent 8 }}{{ end }}

2
nova/templates/deployment-conductor.yaml
View File

@ -63,7 +63,7 @@ spec:
volumeMounts:
- name: nova-etc
mountPath: /etc/nova/nova.conf
subPath: nova.conf
subPath: nova.conf
{{ if $mounts_nova_conductor.volumeMounts }}{{ toYaml $mounts_nova_conductor.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: nova-etc

4
nova/templates/deployment-consoleauth.yaml
View File

@ -65,9 +65,9 @@ spec:
- name: nova-etc
mountPath: /etc/nova/nova.conf
subPath: nova.conf
{{ if $mounts_nova_consoleauth.volumeMounts }}{{ toYaml $mounts_nova_consoleauth.volumeMounts | indent 12 }}{{ end }}
{{ if $mounts_nova_consoleauth.volumeMounts }}{{ toYaml $mounts_nova_consoleauth.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: nova-etc
configMap:
name: nova-etc
{{ if $mounts_nova_consoleauth.volumes }}{{ toYaml $mounts_nova_consoleauth.volumes | indent 8 }}{{ end }}
{{ if $mounts_nova_consoleauth.volumes }}{{ toYaml $mounts_nova_consoleauth.volumes | indent 8 }}{{ end }}

2
nova/templates/deployment-scheduler.yaml
View File

@ -65,7 +65,7 @@ spec:
- name: nova-etc
mountPath: /etc/nova/nova.conf
subPath: nova.conf
{{ if $mounts_nova_scheduler.volumeMounts }}{{ toYaml $mounts_nova_scheduler.volumeMounts | indent 12 }}{{ end }}
{{ if $mounts_nova_scheduler.volumeMounts }}{{ toYaml $mounts_nova_scheduler.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: nova-etc
configMap:

2
nova/templates/service-osapi.yaml
View File

@ -30,4 +30,4 @@ spec:
app: nova-api-osapi
{{ if .Values.network.osapi.node_port.enabled }}
type: NodePort
{{ end }}
{{ end }}