From d1dec09446a070fe9f04999c0097d05046c54113 Mon Sep 17 00:00:00 2001
From: Huan Xie <huan.xie@citrix.com>
Date: Wed, 13 Sep 2017 00:46:22 +0000
Subject: [PATCH] Set host=${dom0_hostname} in related conf

As we have two ovs agent running in domU, we must set different
value for host configuration item. Currently, its value is
${dom0_hostname}-nova for nova, neutron and ceilometer service,
but we found tempest is using hypervisor's name when try to live
migrate VM, see bug https://bugs.launchpad.net/tempest/+bug/1716623.
This patch is to change our devstack plugin to set host item
with value ${dom0_hostname} for n-cpu, q-domua and ceilometer,
then it's align with hypervisor's name

Closes-bug: 1716623
Change-Id: I6a5b77a91898b602ec328afad6567973a2132759
---
 devstack/plugin.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 5f8b567..d099dd2 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -138,7 +138,7 @@ function config_ovs_agent {
     # Configure q-domua, use Dom0's hostname and concat suffix
     local ssh_dom0=$(get_dom0_ssh)
     local dom0_hostname=`$ssh_dom0 "hostname"`
-    iniset $NEUTRON_CORE_PLUGIN_CONF.domU DEFAULT host "${dom0_hostname}-nova"
+    iniset $NEUTRON_CORE_PLUGIN_CONF.domU DEFAULT host "${dom0_hostname}"
 
     # Configure xenapi for q-domua to use its xenserver rootwrap daemon
     iniset $NEUTRON_CORE_PLUGIN_CONF.domU xenapi connection_url "$XENAPI_CONNECTION_URL"
@@ -187,14 +187,14 @@ function config_nova_compute {
     # Configure nova-compute, use Dom0's hostname and concat suffix
     local ssh_dom0=$(get_dom0_ssh)
     local dom0_hostname=`$ssh_dom0 "hostname"`
-    iniset $NOVA_CONF DEFAULT host "${dom0_hostname}-nova"
+    iniset $NOVA_CONF DEFAULT host "${dom0_hostname}"
 }
 
 function config_ceilometer {
     if is_service_enabled ceilometer-acompute; then
         local ssh_dom0=$(get_dom0_ssh)
         local dom0_hostname=`$ssh_dom0 "hostname"`
-        iniset $CEILOMETER_CONF DEFAULT host "${dom0_hostname}-nova"
+        iniset $CEILOMETER_CONF DEFAULT host "${dom0_hostname}"
         iniset $CEILOMETER_CONF DEFAULT hypervisor_inspector xenapi
 
         iniset $CEILOMETER_CONF xenapi connection_url "$XENAPI_CONNECTION_URL"