summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-04-05 11:21:38 +0000
committerGerrit Code Review <review@openstack.org>2016-04-05 11:21:38 +0000
commit9926cfb5324e2ac1e226bf7a3d5650a823d166ab (patch)
tree16f48405835b641057b3ba0f0baf1f9d50ad75d7
parent9679e718a429189ae6aaae5774696fc58de995cb (diff)
parente4578feaefbe733888724549d4ae4b61fd8291ef (diff)
Merge "Nova needs the proper volumes to use Cinder"
-rw-r--r--docker/compute-post.yaml8
1 files changed, 7 insertions, 1 deletions
diff --git a/docker/compute-post.yaml b/docker/compute-post.yaml
index 4532549f..09d0e9fd 100644
--- a/docker/compute-post.yaml
+++ b/docker/compute-post.yaml
@@ -28,7 +28,7 @@ parameters:
default: "/etc/libvirt/libvirtd.conf"
NovaConfig:
type: string
- default: "/etc/nova/nova.conf"
+ default: "/etc/nova/nova.conf,/etc/nova/rootwrap.conf"
NeutronOpenvswitchAgentConfig:
type: string
default: "/etc/neutron/neutron.conf,/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini"
@@ -259,6 +259,8 @@ resources:
volumes:
- /run:/run
- /lib/modules:/lib/modules:ro
+ - /dev:/dev
+ - /lib/udev:/lib/udev
- /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
@@ -316,8 +318,12 @@ resources:
volumes:
- /run:/run
- /lib/modules:/lib/modules:ro
+ - /dev:/dev
+ - /lib/udev:/lib/udev
+ - /etc/iscsi:/etc/iscsi
- /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
+ - /var/lib/etc-data/nova/rootwrap.conf:/var/lib/kolla/config_files/rootwrap.conf:ro
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
volumes_from: