Chef 16 updates

Depends-On: https://review.opendev.org/747752
Depends-On: https://review.opendev.org/747557
Change-Id: I986de1516de71ff578cb8c9e70f8afb49c0347e9
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
Lance Albertson 2020-08-24 08:49:53 -07:00
parent cb7643daef
commit 9f7b019ada
2 changed files with 2 additions and 4 deletions

View File

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

View File

@ -18,8 +18,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
require 'uri'
class Chef::Recipe class Chef::Recipe
include ::Openstack include ::Openstack
end end
@ -37,7 +35,7 @@ package platform_options['tempest_packages'] do
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
admin_user = node['openstack']['identity']['admin_user'] admin_user = node['openstack']['identity']['admin_user']
admin_pass = get_password 'user', admin_user admin_pass = get_password 'user', admin_user