diff --git a/devstack/lib/magnum b/devstack/lib/magnum
index 33a2c7f6b8..32de811f74 100644
--- a/devstack/lib/magnum
+++ b/devstack/lib/magnum
@@ -305,16 +305,16 @@ function magnum_register_image {
         echo "Unknown image extension in $image_filename, supported extensions: tgz, img, qcow2, iso, vhd, vhdx, tar.gz, img.gz, img.bz2, vhd.gz, vhdx.gz"; false
     fi
 
-    openstack --os-url $GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT --os-image-api-version 2 image set $image_name $magnum_image_property
+    openstack image set $image_name $magnum_image_property
 }
 
 #magnum_configure_flavor - set hw_rng property for flavor to address the potential entropy issue
 function magnum_configure_flavor {
     local magnum_flavor_property="--property hw_rng:allowed=True --property hw_rng:rate_bytes=1024 --property hw_rng:rate_period=1"
 
-    local FLAVOR_LIST=$(openstack --os-url $NOVA_SERVICE_PROTOCOL://$NOVA_HOSTPORT --os-compute-api-version 2.1 flavor list -c Name -f value)
+    local FLAVOR_LIST=$(openstack flavor list -c Name -f value)
     for flavor in ${FLAVOR_LIST}; do
-        openstack --os-url $NOVA_SERVICE_PROTOCOL://$NOVA_HOSTPORT --os-compute-api-version 2.1 flavor set $flavor $magnum_flavor_property
+        openstack flavor set $flavor $magnum_flavor_property
     done
 }