commit abb40f61939355f471c1a37c671774923e12b660
author Thiago Paiva <thiagop@lsd.ufcg.edu.br> Thu Oct 29 11:38:24 2015 -0300
committer Thiago Paiva <thiagop@lsd.ufcg.edu.br> Thu Oct 29 11:38:24 2015 -0300
tree 9898186fbb67f57f0fbf8cab207056a0d36158c5
parent b37ca0f7b46e1f1f0d311e17dc35f5a30a501a5e

Correct Cinder protocol for connections on Ironic

The protocol for connections with Cinder is wrong for the Ironic script. This
patch changes the script to use $GLANCE_SERVICE_PROTOCOL, which is https when
USE_SSL=true or tls-proxy is on ENABLED_SERVICES.

Change-Id: I4d4c6f9dc6f6ee53166db109848dca64334b8748

lib/ironic

diff --git a/lib/ironic b/lib/ironic
index de07b49..d786870 100644
--- a/lib/ironic
+++ b/lib/ironic
@@ -795,7 +795,7 @@
     # load them into glance
     IRONIC_DEPLOY_KERNEL_ID=$(openstack \
         --os-token $token \
-        --os-url http://$GLANCE_HOSTPORT \
+        --os-url $GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT \
         image create \
         $(basename $IRONIC_DEPLOY_KERNEL_PATH) \
         --public --disk-format=aki \
@@ -803,7 +803,7 @@
         < $IRONIC_DEPLOY_KERNEL_PATH  | grep ' id ' | get_field 2)
     IRONIC_DEPLOY_RAMDISK_ID=$(openstack \
         --os-token $token \
-        --os-url http://$GLANCE_HOSTPORT \
+        --os-url $GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT \
         image create \
         $(basename $IRONIC_DEPLOY_RAMDISK_PATH) \
         --public --disk-format=ari \