diff options
| author |   Ryan Hallisey <rhallise@redhat.com> | 2016-03-19 12:31:29 +0000 |
|---|---|---|
| committer | Ryan Hallisey <rhallise@redhat.com> | 2016-04-04 06:33:44 -0400 |
| commit | e4578feaefbe733888724549d4ae4b61fd8291ef (patch) | |
| tree | ed83eee1b59b878a297dba8e0c8596d777e7a87a /docker | |
| parent | 4e862ccee2b4afbb3c8b2265217f408a2d503af7 (diff) | |
Nova needs the proper volumes to use Cinder
Kolla has been using ceph. For a while, cinder had
iscsi build into it, but it was removed. In order to
get this to work with containers again, nova-compute and
libvirt containers need /dev and /lib/udev mounted into their
containers.
We also need to copy nova's rootwrap.conf into the nova.
It was missing this config file.
Change-Id: Ie77f56b4576d5393ad3756b0f5ecc3eeff844d1f
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/compute-post.yaml | 8 |
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: |