From 7eca70b1a6dfe58288dcdeae12c99dfab69f890c Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Tue, 24 Feb 2015 00:32:03 -0700 Subject: A functional libvirt + nova_compute + nova_network This imports sdakes' nova-docker codebase to show that atomic upgrades work atleast with nova networking. This has many corrections. For more details read: http://sdake.io/2015/01/28/an-atomic-upgrade-process-for-openstack-compute-nodes/ Implements-blueprint: blueprint libvirt-container Partially-implements; blueprint container-set-compute-operation-nova Change-Id: I858ea113c5656b6da5d2fd13502fecdbd085c8da --- docker/nova-base/config-nova.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'docker/nova-base') diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh index 829fb48de..dd13a1208 100755 --- a/docker/nova-base/config-nova.sh +++ b/docker/nova-base/config-nova.sh @@ -10,10 +10,13 @@ : ${RABBIT_USERID:=guest} : ${RABBIT_PASSWORD:=guest} : ${NETWORK_MANAGER:=nova} +: ${FLAT_NETWORK:=eth0} +: ${PUBLIC_NETWORK:=eth1} check_required_vars KEYSTONE_ADMIN_TOKEN NOVA_DB_PASSWORD \ RABBITMQ_SERVICE_HOST GLANCE_API_SERVICE_HOST \ - KEYSTONE_PUBLIC_SERVICE_HOST PUBLIC_IP + KEYSTONE_PUBLIC_SERVICE_HOST PUBLIC_IP \ + PUBLIC_INTERFACE FLAT_INTERFACE cfg=/etc/nova/nova.conf @@ -72,9 +75,9 @@ if [ "${NETWORK_MANAGER}" == "nova" ] ; then crudini --set $cfg DEFAULT send_arp_for_ha True crudini --set $cfg DEFAULT share_dhcp_address True crudini --set $cfg DEFAULT force_dhcp_release True - crudini --set $cfg DEFAULT flat_interface eth0 + crudini --set $cfg DEFAULT flat_interface $FLAT_INTERFACE crudini --set $cfg DEFAULT flat_network_bridge br100 - crudini --set $cfg DEFAULT public_interface eth1 + crudini --set $cfg DEFAULT public_interface $PUBLIC_INTERFACE elif [ "${NETWORK_MANAGER}" == "neutron" ] ; then check_required_vars NEUTRON_SHARED_SECRET crudini --set $cfg DEFAULT service_neutron_metadata_proxy True -- cgit v1.2.3