openstack/openstack-helm
Code Issues Proposed changes

Merge "Nova: Add policy.yaml to pods and correct values.yaml"

Browse Source
This commit is contained in:
Jenkins 2017-06-20 04:51:14 +00:00 committed by Gerrit Code Review
commit 349da76076
7 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/templates/daemonset-compute.yaml
View File

@ -69,6 +69,10 @@ spec:
mountPath: /etc/nova/api-paste.ini mountPath: /etc/nova/api-paste.ini
subPath: api-paste.ini subPath: api-paste.ini
readOnly: true readOnly: true
- name: nova-etc
mountPath: /etc/nova/policy.yaml
subPath: policy.yaml
readOnly: true
- name: nova-etc - name: nova-etc
mountPath: /etc/resolv.conf mountPath: /etc/resolv.conf
subPath: resolv.conf subPath: resolv.conf

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

@ -95,6 +95,10 @@ spec:
mountPath: /etc/nova/api-paste.ini mountPath: /etc/nova/api-paste.ini
subPath: api-paste.ini subPath: api-paste.ini
readOnly: true readOnly: true
- name: nova-etc
mountPath: /etc/nova/policy.yaml
subPath: policy.yaml
readOnly: true
{{ if $mounts_nova_api_metadata.volumeMounts }}{{ toYaml $mounts_nova_api_metadata.volumeMounts | indent 12 }}{{ end }} {{ if $mounts_nova_api_metadata.volumeMounts }}{{ toYaml $mounts_nova_api_metadata.volumeMounts | indent 12 }}{{ end }}
volumes: volumes:
- name: nova-bin - name: nova-bin

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

@ -83,6 +83,10 @@ spec:
mountPath: /etc/nova/api-paste.ini mountPath: /etc/nova/api-paste.ini
subPath: api-paste.ini subPath: api-paste.ini
readOnly: true readOnly: true
- name: nova-etc
mountPath: /etc/nova/policy.yaml
subPath: policy.yaml
readOnly: true
{{ if $mounts_nova_api_osapi.volumeMounts }}{{ toYaml $mounts_nova_api_osapi.volumeMounts | indent 12 }}{{ end }} {{ if $mounts_nova_api_osapi.volumeMounts }}{{ toYaml $mounts_nova_api_osapi.volumeMounts | indent 12 }}{{ end }}
volumes: volumes:
- name: nova-bin - name: nova-bin

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

@ -66,6 +66,10 @@ spec:
mountPath: /etc/nova/nova.conf mountPath: /etc/nova/nova.conf
subPath: nova.conf subPath: nova.conf
readOnly: true readOnly: true
- name: nova-etc
mountPath: /etc/nova/policy.yaml
subPath: policy.yaml
readOnly: true
{{ if $mounts_nova_conductor.volumeMounts }}{{ toYaml $mounts_nova_conductor.volumeMounts | indent 12 }}{{ end }} {{ if $mounts_nova_conductor.volumeMounts }}{{ toYaml $mounts_nova_conductor.volumeMounts | indent 12 }}{{ end }}
volumes: volumes:
- name: nova-bin - name: nova-bin

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

@ -67,6 +67,10 @@ spec:
mountPath: /etc/nova/nova.conf mountPath: /etc/nova/nova.conf
subPath: nova.conf subPath: nova.conf
readOnly: true readOnly: true
- name: nova-etc
mountPath: /etc/nova/policy.yaml
subPath: policy.yaml
readOnly: true
{{ 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: volumes:
- name: nova-bin - name: nova-bin

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

@ -67,6 +67,10 @@ spec:
mountPath: /etc/nova/nova.conf mountPath: /etc/nova/nova.conf
subPath: nova.conf subPath: nova.conf
readOnly: true readOnly: true
- name: nova-etc
mountPath: /etc/nova/policy.yaml
subPath: policy.yaml
readOnly: true
{{ 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: volumes:
- name: nova-bin - name: nova-bin

2
nova/values.yaml
View File

@ -273,7 +273,7 @@ conf:
oslo_policy: oslo_policy:
oslo: oslo:
policy: policy:
policy_file: policy.yaml policy_file: /etc/nova/policy.yaml
oslo_concurrency: oslo_concurrency:
oslo: oslo:
concurrency: concurrency: