From 9c69cfcbe4c40250d64f1e4cf61c6349a44169cf Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Thu, 24 Jan 2019 14:35:15 +0100 Subject: [PATCH] Deploy Sahara with unversioned endpoints Sahara supports unversioned endpoint also for the current API v1.1, and deploying with unversioned endpoints is a better setting if people want to use both API v1.1 and the (soon-stable) API v2 at the same time. See https://review.openstack.org/#/c/582285/ for more details. Closes-Bug: #1782147 Change-Id: I113af3a351df1cb1d1e3cc5e7bb2e5efd8e58ec7 --- manifests/sahara.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/sahara.pp b/manifests/sahara.pp index b98974fde..b7bdcfb98 100644 --- a/manifests/sahara.pp +++ b/manifests/sahara.pp @@ -29,9 +29,9 @@ class openstack_integration::sahara ( } class { '::sahara::keystone::auth': - public_url => "${::openstack_integration::config::base_url}:8386/v1.1/%(tenant_id)s", - internal_url => "${::openstack_integration::config::base_url}:8386/v1.1/%(tenant_id)s", - admin_url => "${::openstack_integration::config::base_url}:8386/v1.1/%(tenant_id)s", + public_url => "${::openstack_integration::config::base_url}:8386", + internal_url => "${::openstack_integration::config::base_url}:8386", + admin_url => "${::openstack_integration::config::base_url}:8386", password => 'a_big_secret', } class { '::sahara::logging':