From f34e65ab1fc67210c688e0560bfe8a09b00cbbac Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Tue, 21 Oct 2014 09:55:16 -0700 Subject: Only create bridge in nova-network Not all nova services need a bridge. Remove bridge creation from nova-base config and place in nova-network specifically. Change-Id: Ia78c65a4661cd95112dca7ffdc1e839d4f648d52 --- docker/nova-compute/nova-network/Dockerfile | 2 +- docker/nova-compute/nova-network/start.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'docker/nova-compute') diff --git a/docker/nova-compute/nova-network/Dockerfile b/docker/nova-compute/nova-network/Dockerfile index 135c03f4f..62b2a9efb 100644 --- a/docker/nova-compute/nova-network/Dockerfile +++ b/docker/nova-compute/nova-network/Dockerfile @@ -2,7 +2,7 @@ FROM kollaglue/fedora-rdo-nova-base MAINTAINER Steven Dake RUN yum -y install openstack-nova-network \ - ; yum clean all + bridge-utils && yum clean all ADD ./start.sh /start.sh diff --git a/docker/nova-compute/nova-network/start.sh b/docker/nova-compute/nova-network/start.sh index a925cefc9..fdc2d5742 100755 --- a/docker/nova-compute/nova-network/start.sh +++ b/docker/nova-compute/nova-network/start.sh @@ -5,4 +5,6 @@ set -e . /opt/kolla/config-common.sh . /opt/kolla/config-nova.sh +/usr/sbin/brctl addbr br100 + exec /usr/bin/nova-network -- cgit v1.2.3