From 8f2eef63059fc661a8934bbe7caf93c0ee4c7fd4 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Tue, 13 Aug 2019 09:42:20 +0200
Subject: [PATCH] copr: backend: use proper copr_nova* variables

---
 roles/copr/backend/templates/keystonerc                   | 8 ++++----
 .../copr/backend/templates/provision/nova_cloud_vars.yml  | 4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/roles/copr/backend/templates/keystonerc b/roles/copr/backend/templates/keystonerc
index 406be07235..c0ff155661 100644
--- a/roles/copr/backend/templates/keystonerc
+++ b/roles/copr/backend/templates/keystonerc
@@ -7,17 +7,17 @@
 #
 # *NOTE*: Using the 2.0 *auth api* does not mean that compute api is 2.0.  We
 # will use the 1.1 *compute api*
-export OS_AUTH_URL=http://172.23.0.2:5000/v2.0
+export OS_AUTH_URL={{ copr_nova_auth_url }}
 
 # With the addition of Keystone we have standardized on the term **tenant**
 # as the entity that owns the resources.
 
-export OS_TENANT_ID={{ copr_tenant_id }}
+export OS_TENANT_ID={{ copr_nova_tenant_id }}
 export OS_TENANT_NAME={{ copr_nova_tenant_name }}
 
 # In addition to the owning entity (tenant), openstack stores the entity
 # performing the action as the **user**.
-export OS_USERNAME=copr
+export OS_USERNAME={{ copr_nova_username }}
 
 # With Keystone you pass the keystone password.
-export OS_PASSWORD={{ copr_nova_password }}
+export OS_PASSWORD={{ copr_password }}
diff --git a/roles/copr/backend/templates/provision/nova_cloud_vars.yml b/roles/copr/backend/templates/provision/nova_cloud_vars.yml
index 5de93dc5d1..25a59af997 100644
--- a/roles/copr/backend/templates/provision/nova_cloud_vars.yml
+++ b/roles/copr/backend/templates/provision/nova_cloud_vars.yml
@@ -6,9 +6,7 @@ OS_TENANT_NAME: "{{ copr_nova_tenant_name }}"
 
 OS_USERNAME: "{{ copr_nova_username }}"
 
-# remove default values after transition to the new cloud is finished
-OS_PASSWORD_OLD: "{{ copr_nova_password|default('variable OS_PASSWORD_OLD is undefined') }}"
-OS_PASSWORD: "{{ copr_password|default('variable OS_PASSWORD is undefined')}}"
+OS_PASSWORD: "{{ copr_password }}"
 
 flavor_name: "{{ copr_builder_flavor_name }}"
 network_name: "{{ copr_builder_network_name }}"