From aae3cc1ef519eb4ce27841f22a6b1afa61fca6f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <m.andre@redhat.com>
Date: Wed, 27 Sep 2017 09:47:35 +0200
Subject: [PATCH] Fix stackrc for containerized undercloud

Commit 5a400f8011c482abd9c0b550f566bb452159a383 broke the stackrc for
the containerized undercloud, making all the openstack commands fail
with:

  Cannot use v2 authentication with domain scope

This replaces the OS_TENANT_NAME variable with OS_PROJECT_NAME to and
switch to versionless auth_url to use keystone v3 instead.

Change-Id: I869adb75294b38c61e508870a69e1637bb410a94
Closes-Bug: #1719796
---
 extraconfig/post_deploy/undercloud_post.sh   | 2 +-
 extraconfig/post_deploy/undercloud_post.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extraconfig/post_deploy/undercloud_post.sh b/extraconfig/post_deploy/undercloud_post.sh
index 155f1bfe6b..c93b2981c2 100755
--- a/extraconfig/post_deploy/undercloud_post.sh
+++ b/extraconfig/post_deploy/undercloud_post.sh
@@ -13,7 +13,7 @@ export OS_AUTH_TYPE=password
 export OS_PASSWORD=$admin_password
 export OS_AUTH_URL=$auth_url
 export OS_USERNAME=admin
-export OS_TENANT_NAME=admin
+export OS_PROJECT_NAME=admin
 export COMPUTE_API_VERSION=1.1
 export NOVA_VERSION=1.1
 export OS_NO_CACHE=True
diff --git a/extraconfig/post_deploy/undercloud_post.yaml b/extraconfig/post_deploy/undercloud_post.yaml
index ff1556fdb9..32144ddab3 100644
--- a/extraconfig/post_deploy/undercloud_post.yaml
+++ b/extraconfig/post_deploy/undercloud_post.yaml
@@ -85,9 +85,9 @@ resources:
               scheme: http
               host: {get_param: [DeployedServerPortMap, 'control_virtual_ip', fixed_ips, 0, ip_address]}
               port: 5000
-              path: /v2.0
+              path: /
           - make_url:
               scheme: https
               host: {get_param: [DeployedServerPortMap, 'public_virtual_ip', fixed_ips, 0, ip_address]}
               port: 13000
-              path: /v2.0
+              path: /