summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-20 17:28:57 +0000
committerGerrit Code Review <review@openstack.org>2015-11-20 17:28:57 +0000
commit99f29102112272e3c905015bb428282ff7b72632 (patch)
treed2ce5d2e44efd65f543a269cdde99c459f11cc3a
parent159e78db986257d7b0f3e7e28d26d9d283135fea (diff)
parent1264b1bba2b7528b00d745533768a30896e064d7 (diff)
Merge "Nova-libvirt needs to bind to /sys/fs/cgroup"
-rw-r--r--docker/compute-post.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/compute-post.yaml b/docker/compute-post.yaml
index 5dd88726..1dc7be16 100644
--- a/docker/compute-post.yaml
+++ b/docker/compute-post.yaml
@@ -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