Chef 16 updates

Depends-On: https://review.opendev.org/749849
Change-Id: Ief6efb3d2afe2af560fa76eea5fc0b90cadaee7c
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
Lance Albertson 2020-08-24 08:46:42 -07:00
parent 847ab6a6fd
commit 51f22d7623
5 changed files with 3 additions and 13 deletions

View File

@ -11,9 +11,3 @@
Style/IfUnlessModifier:
Exclude:
- 'recipes/apache2-server.rb'
# Offense count: 260
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
# URISchemes: http, https
Metrics/LineLength:
Max: 249

View File

@ -21,7 +21,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 'Installs/Configures the OpenStack Dashboard (Horizon)'
version '19.0.0'
version '19.1.0'
%w(ubuntu redhat centos).each do |os|
supports os

View File

@ -23,8 +23,6 @@
# limitations under the License.
#
require 'uri'
class ::Chef::Recipe
include ::Openstack
include Apache2::Cookbook::Helpers

View File

@ -23,8 +23,6 @@
# limitations under the License.
#
require 'uri'
class ::Chef::Recipe
include ::Openstack
end
@ -32,7 +30,7 @@ end
platform_options = node['openstack']['dashboard']['platform']
identity_endpoint = internal_endpoint 'identity'
auth_url = ::URI.decode identity_endpoint.to_s
auth_url = identity_endpoint.to_s
http_bind = node['openstack']['bind_service']['dashboard_http']
http_bind_address = bind_address http_bind