From c6a6eaed8fef8d747bbbbd93b5723aa52c917355 Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Tue, 18 Jun 2019 15:52:00 -0700 Subject: [PATCH] Fixes to support fog-openstack-1.x fog-openstack-1.x already appends "auth/tokens" so we no longer need to do that. In addition, comment out endpoint type until this PR [1] gets merged and released. [1] https://github.com/fog/fog-openstack/pull/494 Depends-On: https://review.opendev.org/666176 Change-Id: I929722b032e37970fe74018e609b76c1682e0db9 Signed-off-by: Lance Albertson --- recipes/setup.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/recipes/setup.rb b/recipes/setup.rb index e4eaf3d..97f5f15 100644 --- a/recipes/setup.rb +++ b/recipes/setup.rb @@ -45,16 +45,17 @@ admin_pass = get_password 'user', admin_user admin_project = node['openstack']['identity']['admin_project'] admin_domain = node['openstack']['identity']['admin_domain_name'] admin_project_domain_name = node['openstack']['identity']['admin_project_domain'] - -endpoint_type = node['openstack']['identity']['endpoint_type'] +# TODO(ramereth): commenting this out until +# https://github.com/fog/fog-openstack/pull/494 gets merged and released. +# endpoint_type = node['openstack']['identity']['endpoint_type'] connection_params = { - openstack_auth_url: "#{auth_url}/auth/tokens", + openstack_auth_url: auth_url, openstack_username: admin_user, openstack_api_key: admin_pass, openstack_project_name: admin_project, openstack_domain_name: admin_domain, - openstack_endpoint_type: endpoint_type, +# openstack_endpoint_type: endpoint_type, } %w(user1 user2).each_with_index do |user|