starlingx/integ
Code Issues Proposed changes

puppet-keystone was using the wrong hiera data for client

Browse Source 
openstack::client::params was being referenced rather than
platform::client::params.

Need to fix this so that the openstack::client manifests
can be removed along with the other unwanted manifests.

Story: 2004764
Task: 29885
Change-Id: I3c1cc8673be5cf6ab15f9158199bc24fccb44f17
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
Al Bailey 2019-03-07 14:18:54 -06:00
parent 8231278f82
commit 7b58d30158
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/build_srpm.data
View File

@ -1 +1 @@
TIS_PATCH_VER=6 TIS_PATCH_VER=7

14
config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0001-pike-rebase-squash-titanium-patches.patch
View File

@ -1,7 +1,7 @@
From 08bc7eaaa30f2d893ff357376f0d48875f9d1da5 Mon Sep 17 00:00:00 2001 From 2c51d6f4ccf4a473089c08857262e769f7a8fc3a Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com> From: Al Bailey <Al.Bailey@windriver.com>
Date: Tue, 9 Jan 2018 13:37:50 -0600 Date: Thu, 7 Mar 2019 13:43:40 -0600
Subject: [PATCH 2/3] WRS: Patch1: Subject: [PATCH 1/4] WRS: Patch1:
0001-pike-rebase-squash-titanium-patches.patch 0001-pike-rebase-squash-titanium-patches.patch
--- ---
@ -18,7 +18,7 @@ Subject: [PATCH 2/3] WRS: Patch1:
create mode 100644 spec/classes/keystone_security_compliance_spec.rb create mode 100644 spec/classes/keystone_security_compliance_spec.rb
diff --git a/lib/puppet/provider/keystone.rb b/lib/puppet/provider/keystone.rb diff --git a/lib/puppet/provider/keystone.rb b/lib/puppet/provider/keystone.rb
index 3841418..8eb171d 100644 index 3841418..0857ac1 100644
--- a/lib/puppet/provider/keystone.rb --- a/lib/puppet/provider/keystone.rb
+++ b/lib/puppet/provider/keystone.rb +++ b/lib/puppet/provider/keystone.rb
@@ -3,6 +3,7 @@ require 'puppet/provider/openstack' @@ -3,6 +3,7 @@ require 'puppet/provider/openstack'
@ -72,14 +72,14 @@ index 3841418..8eb171d 100644
+ def self.request_by_admin_credential(service, action, error, properties=nil) + def self.request_by_admin_credential(service, action, error, properties=nil)
+ properties ||= [] + properties ||= []
+ @credentials.username = hiera_lookup('openstack::client::params::admin_username') + @credentials.username = hiera_lookup('platform::client::params::admin_username')
+ @credentials.password = hiera_lookup('keystone::admin_password') + @credentials.password = hiera_lookup('keystone::admin_password')
+ @credentials.project_name = 'admin' + @credentials.project_name = 'admin'
+ @credentials.auth_url = service_url + @credentials.auth_url = service_url
+ @credentials.identity_api_version = @credentials.version + @credentials.identity_api_version = @credentials.version
+ if @credentials.version == '3' + if @credentials.version == '3'
+ @credentials.user_domain_name = hiera_lookup('openstack::client::params::admin_user_domain') + @credentials.user_domain_name = hiera_lookup('platform::client::params::admin_user_domain')
+ @credentials.project_domain_name = hiera_lookup('openstack::client::params::admin_project_domain') + @credentials.project_domain_name = hiera_lookup('platform::client::params::admin_project_domain')
+ end + end
+ raise error unless @credentials.set? + raise error unless @credentials.set?
+ Puppet::Provider::Openstack.request(service, action, properties, @credentials) + Puppet::Provider::Openstack.request(service, action, properties, @credentials)