diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-30 09:02:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-30 09:02:21 +0000 |
| commit | ff2d0cd7aad1439288cd36d37884e54f20e498ce (patch) | |
| tree | fd5f9bda3de1c99f7618b3fdc4c025b798bc5dd6 | |
| parent | 2dcaf5ed61dd1b8e0a2d612d35332329645b9707 (diff) | |
| parent | b54420442ef1a4d7a39e4f868a8a8d76e593f510 (diff) | |
| download | kolla-ff2d0cd7aad1439288cd36d37884e54f20e498ce.tar.gz kolla-ff2d0cd7aad1439288cd36d37884e54f20e498ce.zip | |
Merge "change libvirt sock group to nova"
| -rw-r--r-- | ansible/roles/nova/templates/libvirtd.conf.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ansible/roles/nova/templates/libvirtd.conf.j2 b/ansible/roles/nova/templates/libvirtd.conf.j2 index d7a127a61..93137e798 100644 --- a/ansible/roles/nova/templates/libvirtd.conf.j2 +++ b/ansible/roles/nova/templates/libvirtd.conf.j2 @@ -4,7 +4,7 @@ ca_file = "" log_level = 2 log_outputs = "2:file:/var/log/libvirt/libvirtd.log" listen_addr = "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}" -unix_sock_group = "root" +unix_sock_group = "nova" unix_sock_ro_perms = "0777" unix_sock_rw_perms = "0770" auth_unix_ro = "none" diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 341aeb0b0..19f6053ce 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -30,8 +30,7 @@ RUN apt-get install -y --no-install-recommends \ {% endif %} COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start +RUN chmod 755 /usr/local/bin/kolla_extend_start \ + && useradd --user-group nova -{{ include_footer }} - -# TODO(coolsvap/nihilifer): Run libvirt daemon as non-root user. +{{ include_footer }}
\ No newline at end of file |