diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-30 21:49:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-30 21:49:26 +0000 |
| commit | 32b32280da6faa1763188e32438b6b3d836aa032 (patch) | |
| tree | 249536f572616be556ff3883ad5c48e66bab8a07 | |
| parent | d1c459ed52a43807e7d9352abc5161a0aed95e53 (diff) | |
| parent | 1dcd904d27593e818721fe6dc143cd384eb9a6d9 (diff) | |
| download | kolla-32b32280da6faa1763188e32438b6b3d836aa032.tar.gz kolla-32b32280da6faa1763188e32438b6b3d836aa032.zip | |
Merge "Loads ebtables from inside the containers"
| -rw-r--r-- | compose/nova-api-compute-network.yml | 5 | ||||
| -rw-r--r-- | compose/nova-compute-network.yml | 1 | ||||
| -rw-r--r-- | devenv/kollanode.yaml | 3 | ||||
| -rwxr-xr-x | tools/start | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/compose/nova-api-compute-network.yml b/compose/nova-api-compute-network.yml index 8e0c4c08f..fbb009baf 100644 --- a/compose/nova-api-compute-network.yml +++ b/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 diff --git a/compose/nova-compute-network.yml b/compose/nova-compute-network.yml index 299573ae4..fe2e3b9fa 100644 --- a/compose/nova-compute-network.yml +++ b/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 diff --git a/devenv/kollanode.yaml b/devenv/kollanode.yaml index db3f8a3b5..12556d746 100644 --- a/devenv/kollanode.yaml +++ b/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 diff --git a/tools/start b/tools/start index b6dcb3a9c..ade9bf13f 100755 --- a/tools/start +++ b/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}') |