Chef 16 updates

Depends-On: https://review.opendev.org/747557
Change-Id: I0421c776e8de8ebb1ce13fbace97856436ee2489
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
Lance Albertson 2020-08-23 19:43:55 -07:00
parent 1600e4752d
commit ad8219b6d1
3 changed files with 3 additions and 4 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

@ -57,7 +57,7 @@ node.default['openstack']['block-storage']['conf_secrets']
.[]('keystone_authtoken')['password'] =
get_password 'service', 'openstack-block-storage'
auth_url = ::URI.decode identity_endpoint.to_s
auth_url = identity_endpoint.to_s
directory '/etc/cinder' do
group node['openstack']['block-storage']['group']

View File

@ -21,14 +21,13 @@
# limitations under the License.
#
require 'uri'
# Make Openstack object available in Chef::Recipe
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
interfaces = {
public: { url: public_endpoint('block-storage') },