From abb40f61939355f471c1a37c671774923e12b660 Mon Sep 17 00:00:00 2001 From: Thiago Paiva Date: Thu, 29 Oct 2015 11:38:24 -0300 Subject: [PATCH] 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ironic b/lib/ironic index de07b49667..d786870165 100644 --- a/lib/ironic +++ b/lib/ironic @@ -795,7 +795,7 @@ function upload_baremetal_ironic_deploy { # 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 @@ function upload_baremetal_ironic_deploy { < $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 \