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-base/config-nova.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'docker/nova-base') 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 -- cgit v1.2.3