commit d748b16ef29f44fb1b943f7f1963d4c47b88fd5b
author Jenkins <jenkins@review.openstack.org> Wed Sep 04 18:10:50 2013 +0000
committer Gerrit Code Review <review@openstack.org> Wed Sep 04 18:10:50 2013 +0000
tree 25d8aa3c863dca7b015cb07796c3b2d04f98887b
parent 1800a8a1eb71be0d564d0b8f7e92aec87d2fa7d6
parent 08df29bff4e5c9e717358e7593e8c5a9c51a26bf

Merge "Add my_ip option in cinder.conf"

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index b30829f..324db9d 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -226,6 +226,7 @@
         iniset $CINDER_CONF DEFAULT volume_group $VOLUME_GROUP
         iniset $CINDER_CONF DEFAULT volume_name_template ${VOLUME_NAME_PREFIX}%s
     fi
+    iniset $CINDER_CONF DEFAULT my_ip "$CINDER_SERVICE_HOST"
     iniset $CINDER_CONF DEFAULT iscsi_helper tgtadm
     iniset $CINDER_CONF DEFAULT sql_connection `database_connection_url cinder`
     iniset $CINDER_CONF DEFAULT api_paste_config $CINDER_API_PASTE_INI