diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-02 12:29:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-02 12:29:28 +0000 |
| commit | eaf15893a0af7fef1825601bedbd2704a291dd33 (patch) | |
| tree | 198b1b04f99ca58a53c5538918f271ac9b32f3ca /docker/nova-base | |
| parent | 7925b78142c75a70569644c7a75e0e035993d996 (diff) | |
| parent | 7eca70b1a6dfe58288dcdeae12c99dfab69f890c (diff) | |
| download | kolla-eaf15893a0af7fef1825601bedbd2704a291dd33.tar.gz kolla-eaf15893a0af7fef1825601bedbd2704a291dd33.zip | |
Merge "A functional libvirt + nova_compute + nova_network"
Diffstat (limited to 'docker/nova-base')
| -rwxr-xr-x | docker/nova-base/config-nova.sh | 9 |
1 files changed, 6 insertions, 3 deletions
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 |