Chef 16 updates

Depends-On: https://review.opendev.org/749849
Change-Id: I90acd33cc1ed970a0b66f306f84ee1702f963438
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
Lance Albertson
2020-08-23 19:37:38 -07:00
parent dddffa3efd
commit 1e2da56c1e
4 changed files with 4 additions and 6 deletions

View File

@@ -26,7 +26,7 @@ Requirements
============ ============
- Chef 15 or higher - 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) cookbook dependency resolution)
Platform Platform

View File

@@ -3,7 +3,7 @@ maintainer 'openstack-chef'
maintainer_email 'openstack-discuss@lists.openstack.org' maintainer_email 'openstack-discuss@lists.openstack.org'
license 'Apache-2.0' license 'Apache-2.0'
description 'Installs and configures the OpenStack Network API Service and various agents and plugins' description 'Installs and configures the OpenStack Network API Service and various agents and plugins'
version '19.0.0' version '19.1.0'
%w(ubuntu redhat centos).each do |os| %w(ubuntu redhat centos).each do |os|
supports os supports os

View File

@@ -70,7 +70,7 @@ if node['openstack']['mq']['service_type'] == 'rabbit'
end end
identity_endpoint = internal_endpoint 'identity' identity_endpoint = internal_endpoint 'identity'
auth_url = ::URI.decode identity_endpoint.to_s auth_url = identity_endpoint.to_s
db_user = node['openstack']['db']['network']['username'] db_user = node['openstack']['db']['network']['username']
db_pass = get_password 'db', 'neutron' db_pass = get_password 'db', 'neutron'

View File

@@ -20,15 +20,13 @@
# limitations under the License. # limitations under the License.
# #
require 'uri'
# Make Openstack object available in Chef::Recipe # Make Openstack object available in Chef::Recipe
class ::Chef::Recipe class ::Chef::Recipe
include ::Openstack include ::Openstack
end end
identity_endpoint = internal_endpoint 'identity' identity_endpoint = internal_endpoint 'identity'
auth_url = ::URI.decode identity_endpoint.to_s auth_url = identity_endpoint.to_s
interfaces = { interfaces = {
public: { url: public_endpoint('network') }, public: { url: public_endpoint('network') },