Browse code

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

Zuul authored on 2019/08/30 16:24:38
Showing 1 changed files
... ...
@@ -228,8 +228,11 @@ function configure_cinder {
228 228
     iniset $CINDER_CONF DEFAULT osapi_volume_listen $CINDER_SERVICE_LISTEN_ADDRESS
229 229
     iniset $CINDER_CONF DEFAULT state_path $CINDER_STATE_PATH
230 230
     iniset $CINDER_CONF oslo_concurrency lock_path $CINDER_STATE_PATH
231
-    iniset $CINDER_CONF DEFAULT my_ip "$HOST_IP"
232
-
231
+    if [[ $SERVICE_IP_VERSION == 6 ]]; then
232
+        iniset $CINDER_CONF DEFAULT my_ip "$HOST_IPV6"
233
+    else
234
+        iniset $CINDER_CONF DEFAULT my_ip "$HOST_IP"
235
+    fi
233 236
     iniset $CINDER_CONF key_manager backend cinder.keymgr.conf_key_mgr.ConfKeyManager
234 237
     iniset $CINDER_CONF key_manager fixed_key $(openssl rand -hex 16)
235 238