openstack/kolla-ansible
Code Issues Proposed changes

Merge "Make libvirt function on CentOS"

Browse Source
This commit is contained in:
Jenkins 2015-09-29 10:13:03 +00:00 committed by Gerrit Code Review
commit a9eee17159
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/nova/templates/nova-libvirt.json.j2
View File

@ -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",

8
docker/nova/nova-libvirt/start.sh
View File

@ -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