openstack
/
cookbook-openstack-telemetry
Code Issues Proposed changes

Chef 16 updates 

Depends-On: https://review.opendev.org/747556
Change-Id: Ib869c7c1aded0cc0669f83fdad9ac1077851f08f
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
Lance Albertson 2020-08-23 19:47:04 -07:00
parent 68ab6acf42
commit 922e5284e2
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

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

2
recipes/aodh.rb
View File

@ -51,7 +51,7 @@ node.default['openstack']['aodh']['conf_secrets'].tap do |conf_secrets|
end
identity_public_endpoint = public_endpoint 'identity'
auth_url = ::URI.decode identity_public_endpoint.to_s
auth_url = identity_public_endpoint.to_s
node.default['openstack']['aodh']['conf'].tap do |conf|
conf['api']['host'] = bind_service_address

2
recipes/common.rb
View File

@ -61,7 +61,7 @@ node.default['openstack']['telemetry']['conf_secrets'].tap do |conf_secrets|
end
identity_endpoint = public_endpoint 'identity'
auth_url = ::URI.decode identity_endpoint.to_s
auth_url = identity_endpoint.to_s
node.default['openstack']['telemetry']['conf'].tap do |conf|
conf['keystone_authtoken']['auth_url'] = auth_url

2
recipes/gnocchi_configure.rb
View File

@ -41,7 +41,7 @@ node.default['openstack']['telemetry_metric']['conf_secrets'].tap do |conf_secre
end
identity_endpoint = public_endpoint 'identity'
auth_url = ::URI.decode identity_endpoint.to_s
auth_url = identity_endpoint.to_s
node.default['openstack']['telemetry_metric']['conf'].tap do |conf|
conf['api']['host'] = bind_service_address

4
recipes/identity_registration.rb
View File

@ -19,8 +19,6 @@
# limitations under the License.
#
require 'uri'
# Include OS
class ::Chef::Recipe
include ::Openstack
@ -28,7 +26,7 @@ end
identity_endpoint = public_endpoint 'identity'
auth_url = ::URI.decode identity_endpoint.to_s
auth_url = identity_endpoint.to_s
admin_user = node['openstack']['identity']['admin_user']
admin_pass = get_password 'user', node['openstack']['identity']['admin_user']
admin_project = node['openstack']['identity']['admin_project']