Browse code

Merge "Correct Cinder protocol for connections on Ironic"

Jenkins authored on 2015/11/06 07:21:05
Showing 1 changed files
... ...
@@ -795,7 +795,7 @@ function upload_baremetal_ironic_deploy {
795 795
     # load them into glance
796 796
     IRONIC_DEPLOY_KERNEL_ID=$(openstack \
797 797
         --os-token $token \
798
-        --os-url http://$GLANCE_HOSTPORT \
798
+        --os-url $GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT \
799 799
         image create \
800 800
         $(basename $IRONIC_DEPLOY_KERNEL_PATH) \
801 801
         --public --disk-format=aki \
... ...
@@ -803,7 +803,7 @@ function upload_baremetal_ironic_deploy {
803 803
         < $IRONIC_DEPLOY_KERNEL_PATH  | grep ' id ' | get_field 2)
804 804
     IRONIC_DEPLOY_RAMDISK_ID=$(openstack \
805 805
         --os-token $token \
806
-        --os-url http://$GLANCE_HOSTPORT \
806
+        --os-url $GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT \
807 807
         image create \
808 808
         $(basename $IRONIC_DEPLOY_RAMDISK_PATH) \
809 809
         --public --disk-format=ari \