Chef 16 updates

Depends-On: https://review.opendev.org/749849
Change-Id: I030792d1f0ef17210f7deacbb6188c87de1ab90b
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
Lance Albertson 2020-08-23 19:47:04 -07:00
parent d304b6bbca
commit e6560486ab
9 changed files with 8 additions and 16 deletions

View File

@ -13,9 +13,3 @@ Style/IfUnlessModifier:
- 'attributes/gnocchi_conf.rb'
- 'recipes/aodh.rb'
- 'recipes/common.rb'
# Offense count: 80
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
# URISchemes: http, https
Metrics/LineLength:
Max: 163

View File

@ -23,7 +23,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

View File

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

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

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

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

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']

View File

@ -13,7 +13,7 @@ describe 'openstack-telemetry::aodh' do
end
it do
expect(chef_run).to install_apache2_install('openstack').with(listen: '127.0.0.1:8042')
expect(chef_run).to install_apache2_install('openstack').with(listen: %w(127.0.0.1:8042))
end
it do

View File

@ -9,7 +9,7 @@ describe 'openstack-telemetry::gnocchi_configure' do
include_context 'telemetry-stubs'
it do
expect(chef_run).to install_apache2_install('openstack').with(listen: '127.0.0.1:8041')
expect(chef_run).to install_apache2_install('openstack').with(listen: %w(127.0.0.1:8041))
end
it do