openstack
/
cookbook-openstack-identity
Code Issues Proposed changes

Chef 16 updates 

Depends-On: https://review.opendev.org/749561
Depends-On: https://review.opendev.org/749819
Depends-On: https://review.opendev.org/749823
Depends-On: https://review.opendev.org/749826
Depends-On: https://review.opendev.org/749828
Change-Id: I5a44866c513a2d0936db57df2852bdeb892feb64
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
Lance Albertson 2020-08-22 21:08:07 -07:00
parent ec59cf4e04
commit 9a53630c92
7 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -22,7 +22,7 @@ Requirements
============
- Chef 15 or higher
- Chef Workstation 0.15.18 for testing (also includes Berkshelf for
- Chef Workstation 20.8.111 for testing (also includes Berkshelf for
cookbook dependency resolution)
Platform

2
metadata.rb
View File

@ -3,7 +3,7 @@ maintainer 'openstack-chef'
maintainer_email 'openstack-discuss@lists.openstack.org'
license 'Apache-2.0'
description 'The OpenStack Identity service Keystone.'
version '19.0.0'
version '19.1.0'
%w(ubuntu redhat centos).each do |os|
supports os

2
recipes/cloud_config.rb
View File

@ -32,7 +32,7 @@ admin_domain_name = node['openstack']['identity']['admin_domain_name']
ksadmin_pass = get_password 'user', ksadmin_user
identity_endpoint = public_endpoint 'identity'
auth_url = ::URI.decode identity_endpoint.to_s
auth_url = identity_endpoint.to_s
cloud_config = node['openstack']['identity']['cloud_config']

2
recipes/openrc.rb
View File

@ -32,7 +32,7 @@ admin_domain_name = node['openstack']['identity']['admin_domain_name']
ksadmin_pass = get_password 'user', ksadmin_user
identity_endpoint = public_endpoint 'identity'
auth_url = ::URI.decode identity_endpoint.to_s
auth_url = identity_endpoint.to_s
openrc_config = node['openstack']['identity']['openrc']

3
recipes/registration.rb
View File

@ -24,7 +24,6 @@
# inside of this cookbook. The recipe is documented in detail with inline
# comments inside the recipe.
require 'uri'
require 'chef/mixin/shell_out'
class ::Chef::Recipe
@ -33,7 +32,7 @@ end
identity_endpoint = public_endpoint 'identity'
identity_internal_endpoint = internal_endpoint 'identity'
auth_url = ::URI.decode identity_internal_endpoint.to_s
auth_url = identity_internal_endpoint.to_s
# define the credentials to use for the initial admin user
admin_project = node['openstack']['identity']['admin_project']

2
recipes/server-apache.rb
View File

@ -22,8 +22,6 @@
# inside of an apache webserver. The recipe is documented in detail with inline
# comments inside the recipe.
require 'uri'
# load the methods defined in cookbook-openstack-common libraries
class ::Chef::Recipe
include ::Openstack

2
spec/server-apache_spec.rb
View File

@ -321,7 +321,7 @@ describe 'openstack-identity::server-apache' do
end
it do
expect(chef_run).to install_apache2_install('openstack').with(listen: '127.0.0.1:5000')
expect(chef_run).to install_apache2_install('openstack').with(listen: %w(127.0.0.1:5000))
end
it do