commit 1a2f86b3be1eb04a03565b5fead948fc6d04302d
author Jenkins <jenkins@review.openstack.org> Thu Nov 05 22:21:05 2015 +0000
committer Gerrit Code Review <review@openstack.org> Thu Nov 05 22:21:05 2015 +0000
tree 97b63a0357455c4794ea67fc140a5b963fc17180
parent afc9992b0bde46e79ed718ed7e818a22883fe75a
parent abb40f61939355f471c1a37c671774923e12b660

Merge "Correct Cinder protocol for connections on Ironic"

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 \