From b2898812b8edee6d57f6c18cc39211dad0b83ff2 Mon Sep 17 00:00:00 2001
From: James Montalvo <edwin.j.montalvo@nasa.gov>
Date: Tue, 19 Sep 2023 13:40:20 -0500
Subject: [PATCH] fix: load balancer variable naming

Commit 45c7cb04 changed how load balancer groups are accessed. This was
a good change, but some of the load balancer variables were changed
accidentally. e.g.

load_balancers_nonmeza --> load_balancers_meza_nonmeza

This "_meza_nonmeza" ending (a) was applied inconsistently and (b)
doesn't make sense as a naming convention.

This commit fixes naming.
---
 config/defaults.yml    | 10 +++++-----
 src/scripts/getmeza.sh |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/defaults.yml b/config/defaults.yml
index d2ea2c14..08082dc9 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -240,9 +240,9 @@ load_balancers_all: >
   ( groups.get('load_balancers', [] ) ) +
   ( groups.get('load_balancers_meza_internal', [] ) ) +
   ( groups.get('load_balancers_meza_external', [] ) ) +
-  ( groups.get('load_balancers_meza_nonmeza', [] ) ) +
-  ( groups.get('load_balancers_meza_nonmeza_internal', [] ) ) +
-  ( groups.get('load_balancers_meza_nonmeza_external', [] ) )
+  ( groups.get('load_balancers_nonmeza', [] ) ) +
+  ( groups.get('load_balancers_nonmeza_internal', [] ) ) +
+  ( groups.get('load_balancers_nonmeza_external', [] ) )
   }}
 
 
@@ -250,14 +250,14 @@ load_balancers_all: >
 load_balancers_internal: >
   {{
   ( groups.get('load_balancers_meza_internal', [] ) ) +
-  ( groups.get('load_balancers_meza_nonmeza_internal', [] ) )
+  ( groups.get('load_balancers_nonmeza_internal', [] ) )
   }}
 
 # Just load balancers for handling external traffic
 load_balancers_external: >
   {{
   ( groups.get('load_balancers_meza_external', [] ) ) +
-  ( groups.get('load_balancers_meza_nonmeza_external', [] ) )
+  ( groups.get('load_balancers_nonmeza_external', [] ) )
   }}
 
 # Just load balancers that handle internal and external
diff --git a/src/scripts/getmeza.sh b/src/scripts/getmeza.sh
index 7866ac8e..da2711f0 100644
--- a/src/scripts/getmeza.sh
+++ b/src/scripts/getmeza.sh
@@ -65,7 +65,7 @@ if [ -f /etc/redhat-release ]; then
 	done
 
 # if Debian support still desired, add else condition here
-fi 
+fi
 
 # make sure conf-meza exists and has good permissions
 mkdir -p ${INSTALL_DIR}/conf-meza/secret