Merge "Nova-libvirt needs to bind to /sys/fs/cgroup"

This commit is contained in:
Jenkins
2015-11-20 17:28:57 +00:00
committed by Gerrit Code Review

View File

@@ -182,6 +182,7 @@ resources:
volumes:
- /run:/run
- /lib/modules:/lib/modules:ro
- /sys/fs/cgroup:/sys/fs/cgroup
- /var/lib/etc-data/json-config/nova-libvirt.json:/var/lib/kolla/config_files/config.json
- /var/lib/etc-data/libvirt/libvirtd.conf:/var/lib/kolla/config_files/libvirtd.conf
environment:
@@ -254,7 +255,6 @@ resources:
restart: always
volumes:
- /run:/run
- /sys/fs/cgroup:/sys/fs/cgroup
- /lib/modules:/lib/modules:ro
- /var/lib/etc-data/json-config/nova-compute.json:/var/lib/kolla/config_files/config.json
- /var/lib/etc-data/nova/nova.conf:/var/lib/kolla/config_files/nova.conf:ro