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

The policy.yaml was not mounted into pods in Nova, or its location
specified correctly in the default values, this PS resolves that.

Change-Id: Ie4d1b8414f626ac4b5fdc232644d5e8a3a99d8bb
This commit is contained in:
Pete Birley 2017-06-18 21:57:36 -05:00
parent 5a93f0f596
commit c5100307a6
7 changed files with 25 additions and 1 deletions

View File

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

View File

@ -95,6 +95,10 @@ spec:
mountPath: /etc/nova/api-paste.ini
subPath: api-paste.ini
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 }}
volumes:
- name: nova-bin

View File

@ -83,6 +83,10 @@ spec:
mountPath: /etc/nova/api-paste.ini
subPath: api-paste.ini
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 }}
volumes:
- name: nova-bin

View File

@ -66,6 +66,10 @@ spec:
mountPath: /etc/nova/nova.conf
subPath: nova.conf
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 }}
volumes:
- name: nova-bin

View File

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

View File

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

View File

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