05601cbc40
puppet-keystone and puppet-openstacklib need to be updated because of the Train upgrade, to avoid ansible failure. The puppet packages are not fully upgraded because the new versions request an upgrade for Puppet 5. keystone: 0007-update-for-openstackclient-Train-upgrade - Remove deprecated role list options --project and --user. Use role assignment list options --project and --user instead. - Ported from puppet-keystone v15.4.0. openstacklib: 0002-update-for-openstackclient-Train - Add endpoint parameter for Puppet::Provider::Openstack::Credentials, ported from puppet-openstacklib v15.4.0. Ref: https://docs.openstack.org/releasenotes/python-openstackclient/train.html https://docs.openstack.org/releasenotes/puppet-keystone/train.html https://docs.openstack.org/releasenotes/puppet-openstacklib/train.html Tests have been done: 1. Deploy StarlingX with simplex/duplex/multi-node with or without dedicated storage nodes. 2. Apply latest openstack application based on the above deployments. 3. Add node with BMC. 4. Openstack client tests: Create flavor, image, volume, network, subnet and instances. Instance Operations: Pause/Unpause; Suspend/Resume; Stop/Start; Reboot (soft); Reboot (hard) Story: 2007502 Task: 39266 Depends-on: https://review.opendev.org/#/c/716818 Change-Id: I21c0fa2aaa41bae6d0d309763c84afb9e2e5ded9 Signed-off-by: Chen, Yan <yan.chen@intel.com>
36 lines
1.0 KiB
Diff
36 lines
1.0 KiB
Diff
From f3769af45374b58ec9698a73676cbe088c112ac1 Mon Sep 17 00:00:00 2001
|
|
From: chenyan <yan.chen@intel.com>
|
|
Date: Fri, 27 Mar 2020 10:48:23 +0800
|
|
Subject: [PATCH] update for openstackclient Train
|
|
|
|
Signed-off-by: chenyan <yan.chen@intel.com>
|
|
---
|
|
lib/puppet/provider/openstack/credentials.rb | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/lib/puppet/provider/openstack/credentials.rb b/lib/puppet/provider/openstack/credentials.rb
|
|
index 9c831e3..f43da5b 100644
|
|
--- a/lib/puppet/provider/openstack/credentials.rb
|
|
+++ b/lib/puppet/provider/openstack/credentials.rb
|
|
@@ -5,7 +5,7 @@ class Puppet::Provider::Openstack::Credentials
|
|
|
|
KEYS = [
|
|
:auth_url, :password, :project_name, :username,
|
|
- :token, :url,
|
|
+ :token, :endpoint, :url,
|
|
:identity_api_version,
|
|
:region_name,
|
|
:interface
|
|
@@ -28,7 +28,7 @@ class Puppet::Provider::Openstack::Credentials
|
|
end
|
|
|
|
def service_token_set?
|
|
- return true if @token && @url
|
|
+ return true if (@token && @endpoint) || (@token && @url)
|
|
end
|
|
|
|
def to_env
|
|
--
|
|
2.17.1
|
|
|