openstack/kolla-ansible
Code Issues Proposed changes

Only create bridge in nova-network

Browse Source 
Not all nova services need a bridge.  Remove bridge creation from
nova-base config and place in nova-network specifically.

Change-Id: Ia78c65a4661cd95112dca7ffdc1e839d4f648d52
This commit is contained in:
Steven Dake 2014-10-21 09:55:16 -07:00
parent 51643d2fea
commit f34e65ab1f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/nova-base/config-nova.sh
View File

@ -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

2
docker/nova-compute/nova-network/Dockerfile
View File

@ -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

2
docker/nova-compute/nova-network/start.sh
View File

@ -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