commit 0e8934c5ba866c7f909f2318b52e50c8857ed1e5
author Zuul <zuul@review.opendev.org> Fri Aug 30 07:24:38 2019 +0000
committer Gerrit Code Review <review@openstack.org> Fri Aug 30 07:24:38 2019 +0000
tree 07e58c0ae0f2d452c517f13cbbb21c1ab9ac0322
parent e966ba1519007180298c0f27b672c92de9b28e13
parent d331fa7a2d027e98c08aba442c05ba54abc7d6d8

Merge "Set cinder's my_ip based on SERVICE_IP_VERSION value"

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index 32e38c4..fd96053 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -228,8 +228,11 @@
     iniset $CINDER_CONF DEFAULT osapi_volume_listen $CINDER_SERVICE_LISTEN_ADDRESS
     iniset $CINDER_CONF DEFAULT state_path $CINDER_STATE_PATH
     iniset $CINDER_CONF oslo_concurrency lock_path $CINDER_STATE_PATH
-    iniset $CINDER_CONF DEFAULT my_ip "$HOST_IP"
-
+    if [[ $SERVICE_IP_VERSION == 6 ]]; then
+        iniset $CINDER_CONF DEFAULT my_ip "$HOST_IPV6"
+    else
+        iniset $CINDER_CONF DEFAULT my_ip "$HOST_IP"
+    fi
     iniset $CINDER_CONF key_manager backend cinder.keymgr.conf_key_mgr.ConfKeyManager
     iniset $CINDER_CONF key_manager fixed_key $(openssl rand -hex 16)