diff options
| author | Steven Dake <sdake@redhat.com> | 2014-10-21 09:55:16 -0700 |
|---|---|---|
| committer | Steven Dake <sdake@redhat.com> | 2014-10-21 09:57:25 -0700 |
| commit | f34e65ab1fc67210c688e0560bfe8a09b00cbbac (patch) | |
| tree | af53fcdd18a96e5fe6b4955c0c990dafb3d65c1d /docker | |
| parent | 51643d2fea52fc37ae71ebb012b5425278326db3 (diff) | |
| download | kolla-f34e65ab1fc67210c688e0560bfe8a09b00cbbac.tar.gz kolla-f34e65ab1fc67210c688e0560bfe8a09b00cbbac.zip | |
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
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/nova-base/config-nova.sh | 4 | ||||
| -rw-r--r-- | docker/nova-compute/nova-network/Dockerfile | 2 | ||||
| -rwxr-xr-x | docker/nova-compute/nova-network/start.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh index 4f086e857..56b673944 100755 --- a/docker/nova-base/config-nova.sh +++ b/docker/nova-base/config-nova.sh @@ -67,8 +67,6 @@ crudini --set $cfg DEFAULT admin_token "${KEYSTONE_ADMIN_TOKEN}" crudini --set $cfg conductor workers 8 -/usr/sbin/brctl addbr nova_br - crudini --set /etc/nova/nova.conf DEFAULT network_manager nova.network.manager.FlatDHCPManager crudini --set /etc/nova/nova.conf DEFAULT firewall_driver nova.virt.libvirt.firewall.IptablesFirewallDriver crudini --set /etc/nova/nova.conf DEFAULT network_size 254 @@ -78,7 +76,7 @@ crudini --set /etc/nova/nova.conf DEFAULT send_arp_for_ha True crudini --set /etc/nova/nova.conf DEFAULT share_dhcp_address True crudini --set /etc/nova/nova.conf DEFAULT force_dhcp_release True crudini --set /etc/nova/nova.conf DEFAULT flat_interface eth0 -crudini --set /etc/nova/nova.conf DEFAULT flat_network_bridge nova_br +crudini --set /etc/nova/nova.conf DEFAULT flat_network_bridge br100 crudini --set /etc/nova/nova.conf DEFAULT public_interface eth0 # disabled pending answers to http://lists.openstack.org/pipermail/openstack/2014-October/009997.html 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 <sdake@redhat.com> 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 |