commit 2da019f133bb3e53ef67e33cfd269a9b6a72d27a
author Ken'ichi Ohmichi <ken-oomichi@wx.jp.nec.com> Wed Oct 11 09:57:25 2017 -0700
committer Ken'ichi Ohmichi <ken-oomichi@wx.jp.nec.com> Wed Oct 11 09:57:25 2017 -0700
tree 1d644bc57c3ac8ea78d1bcdd4b4f12d10b72735c
parent e4eef81c2bd257e890be636a7a9fd4cb61ea3d5b

Replace the deprecated nova_metadata_ip

As [1], the option nova_metadata_ip has been deprecated and
we can use nova_metadata_host instead. This patch makes devstack
do it.

[1]: http://git.openstack.org/cgit/openstack/neutron/tree/neutron/conf/agent/metadata/config.py#n49

Change-Id: Ifda43ec8c7743af6acdd3003c55c081ef5b1311c

lib/neutron

diff --git a/lib/neutron b/lib/neutron
index 21c8d4c..c5839f5 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -243,7 +243,7 @@
         cp $NEUTRON_DIR/etc/metadata_agent.ini.sample $NEUTRON_META_CONF
 
         iniset $NEUTRON_META_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
-        iniset $NEUTRON_META_CONF DEFAULT nova_metadata_ip $SERVICE_HOST
+        iniset $NEUTRON_META_CONF DEFAULT nova_metadata_host $SERVICE_HOST
         iniset $NEUTRON_META_CONF DEFAULT metadata_workers $API_WORKERS
         # TODO(ihrachys) do we really need to set rootwrap for metadata agent?
         configure_root_helper_options $NEUTRON_META_CONF