Chef 16 updates
Depends-On: https://review.opendev.org/747556 Change-Id: Ia1d62b3d9e8843956831faa30436e2fdc6992c8d Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
parent
2c761a06b6
commit
91c88364b2
|
@ -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
|
||||
|
|
|
@ -23,8 +23,6 @@
|
|||
# limitations under the License.
|
||||
#
|
||||
|
||||
require 'uri'
|
||||
|
||||
class ::Chef::Recipe
|
||||
include ::Openstack
|
||||
include Apache2::Cookbook::Helpers
|
||||
|
|
|
@ -23,8 +23,6 @@
|
|||
# limitations under the License.
|
||||
#
|
||||
|
||||
require 'uri'
|
||||
|
||||
class ::Chef::Recipe
|
||||
include ::Openstack
|
||||
end
|
||||
|
@ -32,7 +30,7 @@ end
|
|||
platform_options = node['openstack']['dashboard']['platform']
|
||||
|
||||
identity_endpoint = internal_endpoint 'identity'
|
||||
auth_url = ::URI.decode identity_endpoint.to_s
|
||||
auth_url = identity_endpoint.to_s
|
||||
|
||||
http_bind = node['openstack']['bind_service']['dashboard_http']
|
||||
http_bind_address = bind_address http_bind
|
||||
|
|
Loading…
Reference in New Issue