openstack/openstack-helm
Code Issues Proposed changes

Merge "Make qemu use nova user"

Browse Source
This commit is contained in:
Jenkins 2017-09-21 03:17:30 +00:00 committed by Gerrit Code Review
commit 9e117ce95b
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libvirt/templates/etc/_libvirtd.conf.tpl
View File

@ -17,6 +17,6 @@ limitations under the License.
listen_tcp = 1
auth_tcp = "none"
ca_file = ""
log_level = {{ .Values.libvirt.log_level }}
log_outputs = "{{ .Values.libvirt.log_level }}:stderr"
listen_addr = "{{ .Values.libvirt.listen_addr }}"
log_level = {{ .Values.conf.libvirt.log_level }}
log_outputs = "{{ .Values.conf.libvirt.log_level }}:stderr"
listen_addr = "{{ .Values.conf.libvirt.listen_addr }}"

2
libvirt/templates/etc/_qemu.conf.tpl
View File

@ -28,3 +28,5 @@ limitations under the License.
# rollover when a size limit is hit.
#
stdio_handler = "file"
{{ if not .Values.conf.qemu.user }}#{{ end }}user = {{ .Values.conf.qemu.user | default "nova" | quote }}
{{ if not .Values.conf.qemu.group }}#{{ end }}group = {{ .Values.conf.qemu.group | default "kvm" | quote }}

11
libvirt/values.yaml
View File

@ -29,7 +29,6 @@ images:
libvirt: docker.io/kolla/ubuntu-source-nova-libvirt:3.0.3
pull_policy: "IfNotPresent"
ceph:
enabled: true
monitors: []
@ -37,9 +36,13 @@ ceph:
cinder_keyring: null
secret_uuid: 457eb676-33da-42ec-9a8c-9293d545c337
libvirt:
listen_addr: 0.0.0.0
log_level: 3
conf:
libvirt:
listen_addr: 0.0.0.0
log_level: 3
qemu:
user: "nova"
group: "kvm"
pod:
affinity: