openstack/openstack-helm
Code Issues Proposed changes

Merge pull request #120 from mattmceuen/nodeselector-conflicts

Browse Source 
Nodeselector conflicts
This commit is contained in:
Brandon B. Jozsa 2017-01-16 17:05:54 -05:00 committed by GitHub
commit c7c3d9044d
6 changed files with 9 additions and 9 deletions

4
neutron/templates/job-db-sync.yaml

@ -7,7 +7,7 @@ spec:
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }}
containers: containers:
- name: neutron-db-sync - name: neutron-db-sync
image: {{ .Values.images.db_sync }} image: {{ .Values.images.db_sync }}
@ -42,4 +42,4 @@ spec:
name: neutron-etc name: neutron-etc
- name: ml2confini - name: ml2confini
configMap: configMap:
name: neutron-etc name: neutron-etc

4
neutron/templates/job-init.yaml

@ -7,7 +7,7 @@ spec:
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }}
containers: containers:
- name: neutron-init - name: neutron-init
image: {{ .Values.images.init }} image: {{ .Values.images.init }}
@ -36,4 +36,4 @@ spec:
volumes: volumes:
- name: initsh - name: initsh
configMap: configMap:
name: neutron-bin name: neutron-bin

4
neutron/templates/job-post.yaml

@ -7,7 +7,7 @@ spec:
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }}
containers: containers:
- name: neutron-post - name: neutron-post
image: {{ .Values.images.post }} image: {{ .Values.images.post }}
@ -38,4 +38,4 @@ spec:
volumes: volumes:
- name: postsh - name: postsh
configMap: configMap:
name: neutron-bin name: neutron-bin

2
nova/templates/job-db-sync.yaml

@ -34,7 +34,7 @@ spec:
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
containers: containers:
- name: nova-db-sync - name: nova-db-sync
image: {{ .Values.image.db_sync }} image: {{ .Values.image.db_sync }}

2
nova/templates/job-init.yaml

@ -34,7 +34,7 @@ spec:
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
containers: containers:
- name: nova-init - name: nova-init
image: {{ .Values.image.init }} image: {{ .Values.image.init }}

2
nova/templates/job-post.yaml

@ -34,7 +34,7 @@ spec:
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
containers: containers:
- name: nova-post - name: nova-post
image: {{ .Values.image.post }} image: {{ .Values.image.post }}