diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-29 10:13:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-29 10:13:03 +0000 |
| commit | a9eee171599116ee7508a5f94933328c5a8d2d02 (patch) | |
| tree | 43609b964099033945aa1a681fff596e9463ee0e | |
| parent | 2599e221a88e2cbf3d03b60e75264fe7c7d4bcfb (diff) | |
| parent | 655d88e3a1054b61d9ede8b99c5ee95f11948227 (diff) | |
| download | kolla-a9eee171599116ee7508a5f94933328c5a8d2d02.tar.gz kolla-a9eee171599116ee7508a5f94933328c5a8d2d02.zip | |
Merge "Make libvirt function on CentOS"
| -rw-r--r-- | ansible/roles/nova/templates/nova-libvirt.json.j2 | 2 | ||||
| -rwxr-xr-x | docker/nova/nova-libvirt/start.sh | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ansible/roles/nova/templates/nova-libvirt.json.j2 b/ansible/roles/nova/templates/nova-libvirt.json.j2 index 598cc9f64..78d38683a 100644 --- a/ansible/roles/nova/templates/nova-libvirt.json.j2 +++ b/ansible/roles/nova/templates/nova-libvirt.json.j2 @@ -5,7 +5,7 @@ "source": "/opt/kolla/config_files/libvirtd.conf", "dest": "/etc/libvirt/libvirtd.conf", "owner": "root", - "perm": "0600" + "perm": "0644" }{% if enable_ceph | bool %}, { "source": "/opt/kolla/config_files/secrets", diff --git a/docker/nova/nova-libvirt/start.sh b/docker/nova/nova-libvirt/start.sh index a083e7bac..df3b0e5a9 100755 --- a/docker/nova/nova-libvirt/start.sh +++ b/docker/nova/nova-libvirt/start.sh @@ -4,4 +4,12 @@ set -o errexit # Loading common functions. source /opt/kolla/kolla-common.sh +# TODO(SamYaple): Tweak libvirt.conf rather than change permissions. +# Fix permissions for libvirt +# Do not remove unless CentOS has been validated +if [[ -c /dev/kvm ]]; then + chmod 660 /dev/kvm + chown root:kvm /dev/kvm +fi + exec $CMD |