Chef 16 updates

Depends-On: https://review.opendev.org/747602
Change-Id: I05135e9eb7a945019d0657b6e48b8a0ca5e63145
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
Lance Albertson 2020-08-24 08:36:19 -07:00
parent f1f112aff3
commit bec72e2bc2
3 changed files with 3 additions and 5 deletions

View File

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

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'