commit 66afb47cb9b470bfa40f11f23ca4f80483cb7aad
author Akihiro MOTOKI <motoki@da.jp.nec.com> Fri Dec 21 15:34:13 2012 +0900
committer Akihiro MOTOKI <motoki@da.jp.nec.com> Wed Dec 26 23:41:38 2012 +0900
tree b3348d9d359906dfe06d4a5a3b6da36546079f60
parent 7ae9425e046a147414d8bbb20408bd0ff3807125

Refactor quantum installation

* Move quantum installation to lib/quantum
* Refactor quantum configuration
* Move Quantum service account creation from keystone_data.sh to lib/quantum
* Define generic functions to install third party programs

* Minor cleanups related to Quantum
  * Kill dnsmasq which watches an interface 'ns-XXXXXX' in unstack.sh
  * Set default_floating_pool in nova.conf to make default flaoting pool
    work when PUBLIC_NETWORK_NAME is other than 'nova'
  * Make tempest work even when PRIVATE_NETWORK_NAME is other than 'private'

Change-Id: I4a6e7fcebfb11556968f53ab6a0e862ce16bb139

lib/nova

diff --git a/lib/nova b/lib/nova
index d5cefc9..26c5d3c 100644
--- a/lib/nova
+++ b/lib/nova
@@ -348,6 +348,7 @@
     add_nova_opt "dhcpbridge_flagfile=$NOVA_CONF"
     add_nova_opt "force_dhcp_release=True"
     add_nova_opt "fixed_range=$FIXED_RANGE"
+    add_nova_opt "default_floating_pool=$PUBLIC_NETWORK_NAME"
     add_nova_opt "s3_host=$SERVICE_HOST"
     add_nova_opt "s3_port=$S3_SERVICE_PORT"
     add_nova_opt "osapi_compute_extension=nova.api.openstack.compute.contrib.standard_extensions"
@@ -413,6 +414,16 @@
     done
 }
 
+function create_nova_conf_nova_network() {
+    add_nova_opt "network_manager=nova.network.manager.$NET_MAN"
+    add_nova_opt "public_interface=$PUBLIC_INTERFACE"
+    add_nova_opt "vlan_interface=$VLAN_INTERFACE"
+    add_nova_opt "flat_network_bridge=$FLAT_NETWORK_BRIDGE"
+    if [ -n "$FLAT_INTERFACE" ]; then
+        add_nova_opt "flat_interface=$FLAT_INTERFACE"
+    fi
+}
+
 # init_nova() - Initialize databases, etc.
 function init_nova() {
     # Nova Database