From 41768e0ae18473f8112be623b326d84d0dd78bf9 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 20 Sep 2019 11:15:03 +1000 Subject: [PATCH] Remove --os-url usage The token end-point --os-url argument was removed in openstackclient with I1b9fbb96e447889a41b705324725a2ffc8ecfd9f. The plugin should be running as admin, I think we can remove all the authentication arguments and just let it do it's thing. Change-Id: I9b1dbc541c9fd6c0e3a894dd3a5dd9f2011f1e2a --- devstack/lib/magnum | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 }