From 78b2f90e033a3f1b2b3bcba347c37ccf619d7e7c Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Wed, 11 Dec 2024 15:59:21 +0900
Subject: [PATCH] Drop unnecessary OS_CLOUD override

The functions we use to manage keystone resources explicitly set
--os-cloud arguments, so the OS_CLOUD environment is not actually
honored.

Change-Id: I87607e0b6ca344069b5877087e65f0e2557d831b
---
 devstack/plugin.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 387c5d1b04..512ef1eb42 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -109,11 +109,6 @@ function _ceilometer_prepare_virt_drivers {
 
 # Create ceilometer related accounts in Keystone
 function ceilometer_create_accounts {
-    # At this time, the /etc/openstack/clouds.yaml is available,
-    # we could leverage that by setting OS_CLOUD
-    OLD_OS_CLOUD=$OS_CLOUD
-    export OS_CLOUD='devstack-admin'
-
     create_service_user "ceilometer" "admin"
 
     if is_service_enabled swift; then
@@ -131,7 +126,6 @@ function ceilometer_create_accounts {
             "$(gnocchi_service_url)" \
             "$(gnocchi_service_url)"
     fi
-    export OS_CLOUD=$OLD_OS_CLOUD
 }