Chef 16 updates

Depends-On: https://review.opendev.org/749849
Depends-On: https://review.opendev.org/750021
Change-Id: I776ac5b377b4c836a029b43d1ccc3847c5641622
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
Lance Albertson 2020-08-24 08:36:19 -07:00
parent b676cab8b1
commit 6d780e21af
5 changed files with 4 additions and 12 deletions

View File

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

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

@ -7,7 +7,7 @@ source_url 'https://opendev.org/openstack/cookbook-openstack-dns'
license 'Apache-2.0'
description 'Installs and configures the Designate Service'
chef_version '>= 15.0'
version '19.0.0'
version '19.2.0'
%w(ubuntu redhat centos).each do |os|
supports os

View File

@ -19,14 +19,12 @@
# limitations under the License.
#
require 'uri'
class ::Chef::Recipe
include ::Openstack
end
identity_endpoint = internal_endpoint 'identity'
auth_url = ::URI.decode identity_endpoint.to_s
auth_url = identity_endpoint.to_s
internal_designate_endpoint = internal_endpoint 'dns-api'
public_designate_endpoint = public_endpoint 'dns-api'

View File

@ -27,7 +27,7 @@ dns_endpoint = internal_endpoint 'dns-api'
dns_url = dns_endpoint.to_s + '/v2'
identity_endpoint = internal_endpoint 'identity'
auth_url = ::URI.decode identity_endpoint.to_s
auth_url = identity_endpoint.to_s
node.default['openstack']['network']['conf'].tap do |conf|
conf['DEFAULT']['external_dns_driver'] = 'designate'