Merge "Loads ebtables from inside the containers"

compose/nova-api-compute-network.yml

@@ -14,6 +14,7 @@ libvirt:
    volumes:
     - /run:/run
     - /sys/fs/cgroup:/sys/fs/cgroup
+    - /lib/modules:/lib/modules:ro
    volumes_from:
     - computedata
 
@@ -28,6 +29,7 @@ novanetwork:
    volumes:
     - /run:/run
     - /sys/fs/cgroup:/sys/fs/cgroup
+    - /lib/modules:/lib/modules:ro
    volumes_from:
     - computedata
 
@@ -43,6 +45,8 @@ novaapi:
   restart: always
   env_file:
    - openstack.env
+  volumes:
+   - /lib/modules:/lib/modules:ro
 
 novacompute:
    image: kollaglue/centos-rdo-nova-compute
@@ -55,5 +59,6 @@ novacompute:
    volumes:
     - /run:/run
     - /sys/fs/cgroup:/sys/fs/cgroup
+    - /lib/modules:/lib/modules:ro
    volumes_from:
     - computedata

compose/nova-compute-network.yml

@@ -28,6 +28,7 @@ novanetwork:
    volumes:
     - /run:/run
     - /sys/fs/cgroup:/sys/fs/cgroup
+    - /lib/modules:/lib/modules:ro
    volumes_from:
     - computedata
 

devenv/kollanode.yaml

@@ -182,9 +182,6 @@ resources:
             tar -xvf version-m3.tar.gz
             mv kolla-version-m3 kolla
 
-            # Load ebtables kernel module required for networking
-            modprobe ebtables
-
             # Start NTP
             systemctl enable ntpd
             systemctl start ntpd

tools/start

@@ -23,10 +23,6 @@ setenforce permissive
 # is not installed in the system.
 mkdir -p /etc/libvirt/qemu
 
-# This should probably go into nova-networking or nova-compute containers.
-# but you can't modprobe from a container for some reason
-modprobe ebtables
-
 MY_IP=$(ip route get $(ip route | awk '$1 == "default" {print $3}') |
     awk '$4 == "src" {print $5}')