From 6d780e21af484a07010699e5ddb7a804d9459d89 Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Mon, 24 Aug 2020 08:36:19 -0700 Subject: [PATCH] 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 --- .rubocop_todo.yml | 6 ------ README.rst | 2 +- metadata.rb | 2 +- recipes/identity_registration.rb | 4 +--- recipes/neutron_int.rb | 2 +- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index fc2d7ed..b464a27 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -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 diff --git a/README.rst b/README.rst index 464f42a..9932da3 100644 --- a/README.rst +++ b/README.rst @@ -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 diff --git a/metadata.rb b/metadata.rb index 7965401..b9685a4 100644 --- a/metadata.rb +++ b/metadata.rb @@ -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 diff --git a/recipes/identity_registration.rb b/recipes/identity_registration.rb index 560bb1b..ed11333 100644 --- a/recipes/identity_registration.rb +++ b/recipes/identity_registration.rb @@ -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' diff --git a/recipes/neutron_int.rb b/recipes/neutron_int.rb index 1810514..cc1ab42 100644 --- a/recipes/neutron_int.rb +++ b/recipes/neutron_int.rb @@ -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'