From 70784aa0da6185e7e1474feedb2734cfe5cb8104 Mon Sep 17 00:00:00 2001
From: kgoncalv <kayo.goncalvesdacosta@windriver.com>
Date: Thu, 9 Jan 2025 12:41:11 -0300
Subject: [PATCH] Fix for stx-openstack upload failure

During the review of the change [1], a block of source code has
been completely indented. This completely changed the structure of
the source code previously validated at Patchset 8 [2], causing the
stx-openstack upload failure.

The fix was to undo the wrong indentation, taking the code back to the
correct indentation tested at Patchset 8 [2].

[1] https://review.opendev.org/c/starlingx/openstack-armada-app/+/938407
[2] https://review.opendev.org/c/starlingx/openstack-armada-app/+/938407/8

Test Plan:

PASS: build-pkg openstack -c -l openstack
PASS: build openstack tarball
PASS: upload and apply openstack on a system

Closes-Bug: #2093370

Change-Id: I3c405b473515011a0ffb4568873708e72909ce3a
Signed-off-by: kgoncalv <kayo.goncalvesdacosta@windriver.com>
---
 .../k8sapp_openstack/helm/nova.py             | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py
index 9ba79e3ca..3d4caccdb 100644
--- a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py
+++ b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py
@@ -681,24 +681,24 @@ class NovaHelm(openstack.OpenstackBaseHelm):
                             }
                         }
                     }
-                # add first host to config_map
-                if not config_map:
-                    config_map.append({
-                        'conf': host_nova['conf'],
-                        'name': [hostname]
-                    })
-                else:
-                    # check if an identical configuration already exists in the config_map
-                    for config in config_map:
-                        if config['conf'] == host_nova['conf']:
-                            config['name'].append(hostname)
-                            break
-                    else:
-                        # add new config to config_map
+                    # add first host to config_map
+                    if not config_map:
                         config_map.append({
                             'conf': host_nova['conf'],
                             'name': [hostname]
                         })
+                    else:
+                        # check if an identical configuration already exists in the config_map
+                        for config in config_map:
+                            if config['conf'] == host_nova['conf']:
+                                config['name'].append(hostname)
+                                break
+                        else:
+                            # add new config to config_map
+                            config_map.append({
+                                'conf': host_nova['conf'],
+                                'name': [hostname]
+                            })
         host_list.extend(config_map)
         return host_list