From 2e354d7a03d846ecc1342563f5cfc563dbecb145 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Thu, 26 Jul 2018 15:27:31 -0500 Subject: [PATCH] Use --os-endpoint-type for Cinder CLI The --endpoint-type option has been deprecated in Cinder for several years and was just recently removed. It was missed that the tempest lib CLI code was still using that to specify the public URL. This updates the Cinder CLI handling to use the more conventional --os-endpoint-type. Change-Id: Icb81710a6b905d80c2e75b29be449dc029e01bdd Signed-off-by: Sean McGinnis Closes-bug: #1783885 Signed-off-by: Sean McGinnis --- .../notes/cinder-use-os-endpoint-type-c11f63fd468ceb4c.yaml | 6 ++++++ tempest/lib/cli/base.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/cinder-use-os-endpoint-type-c11f63fd468ceb4c.yaml diff --git a/releasenotes/notes/cinder-use-os-endpoint-type-c11f63fd468ceb4c.yaml b/releasenotes/notes/cinder-use-os-endpoint-type-c11f63fd468ceb4c.yaml new file mode 100644 index 0000000000..1dda4e1c5f --- /dev/null +++ b/releasenotes/notes/cinder-use-os-endpoint-type-c11f63fd468ceb4c.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Cinder CLI calls have now been updated to use the ``--os-endpoint-type`` + option instead of ``--endpoint-type``. The latter had been deprecated in + Cinder and has been removed in the Rocky release. diff --git a/tempest/lib/cli/base.py b/tempest/lib/cli/base.py index 3fb56ec61b..d8c776b0b3 100644 --- a/tempest/lib/cli/base.py +++ b/tempest/lib/cli/base.py @@ -269,7 +269,7 @@ class CLIClient(object): :param merge_stderr: if True the stderr buffer is merged into stdout :type merge_stderr: boolean """ - flags += ' --endpoint-type %s' % endpoint_type + flags += ' --os-endpoint-type %s' % endpoint_type return self.cmd_with_auth( 'cinder', action, flags, params, fail_ok, merge_stderr)