quantum: update configuration and deployment options

Replace the controller and compute specific deployment classes with the central
"hosts" class, and change the configuration file update routines to use the
new values and externally visible IPs.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-quantum_2013.1.3.bb b/meta-openstack/recipes-devtools/python/python-quantum_2013.1.3.bb
index 70094f1..34da3c9 100644
--- a/meta-openstack/recipes-devtools/python/python-quantum_2013.1.3.bb
+++ b/meta-openstack/recipes-devtools/python/python-quantum_2013.1.3.bb
@@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "79e60ec1aef800da3a4e1841909cdd8b2cf645979d08f27bc481957c79
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-inherit setuptools update-rc.d identity
+inherit setuptools update-rc.d identity hosts
 
 do_install_append() {
     TEMPLATE_CONF_DIR=${S}${sysconfdir}/
@@ -34,7 +34,7 @@ do_install_append() {
     sed -e "s:^# core_plugin.*:core_plugin = quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2:g" \
         -i ${WORKDIR}/quantum.conf
 
-    echo "rabbit_host = ${CONTROLLER_EXTERNAL_IP}" >> ${WORKDIR}/quantum.conf
+    echo "rabbit_host = ${CONTROLLER_IP}" >> ${WORKDIR}/quantum.conf
 
     for file in ovs_quantum_plugin.ini linuxbridge_conf.ini
     do