Merge pull request #38 from nasa/grc-atf-dev

Grc atf dev
nasa · Sep 22, 2023 · 26764c8 · 26764c8
2 parents 221e317 + a47e1c5
commit 26764c8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/config/defaults.yml b/config/defaults.yml
@@ -240,24 +240,24 @@ 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', [] ) )
   }}
 
 
 # Just load balancers for handling internal services
 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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@