Browse code
Un-quote metadata address if it is IPv6
In lib/neutron-legacy, the Nova metadata host address is
un-quoted if it is IPv6, i.e. 2001:db8::1, not [2001:db8::1].
We should be doing the same in lib/neutron.
Change-Id: I80c96603a41ef9d289712ef15b464859aa9257be
Brian Haley authored on 2019/08/01 01:18:39Showing 1 changed files
| ... | ... |
@@ -54,6 +54,7 @@ NEUTRON_DHCP_BINARY="neutron-dhcp-agent" |
| 54 | 54 |
NEUTRON_CONF_DIR=/etc/neutron |
| 55 | 55 |
NEUTRON_CONF=$NEUTRON_CONF_DIR/neutron.conf |
| 56 | 56 |
NEUTRON_META_CONF=$NEUTRON_CONF_DIR/metadata_agent.ini |
| 57 |
+NEUTRON_META_DATA_HOST=${NEUTRON_META_DATA_HOST:-$(ipv6_unquote $SERVICE_HOST)}
|
|
| 57 | 58 |
|
| 58 | 59 |
NEUTRON_DHCP_CONF=$NEUTRON_CONF_DIR/dhcp_agent.ini |
| 59 | 60 |
NEUTRON_L3_CONF=$NEUTRON_CONF_DIR/l3_agent.ini |
| ... | ... |
@@ -296,7 +297,7 @@ function configure_neutron_new {
|
| 296 | 296 |
cp $NEUTRON_DIR/etc/metadata_agent.ini.sample $NEUTRON_META_CONF |
| 297 | 297 |
|
| 298 | 298 |
iniset $NEUTRON_META_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL |
| 299 |
- iniset $NEUTRON_META_CONF DEFAULT nova_metadata_host $SERVICE_HOST |
|
| 299 |
+ iniset $NEUTRON_META_CONF DEFAULT nova_metadata_host $NEUTRON_META_DATA_HOST |
|
| 300 | 300 |
iniset $NEUTRON_META_CONF DEFAULT metadata_workers $API_WORKERS |
| 301 | 301 |
# TODO(ihrachys) do we really need to set rootwrap for metadata agent? |
| 302 | 302 |
configure_root_helper_options $NEUTRON_META_CONF |