From c1db168d57e3a6fdb3fe075eea0d9114e6ef4a1a Mon Sep 17 00:00:00 2001
From: Kevin Carter <kevin@cloudnull.com>
Date: Mon, 9 Dec 2024 13:30:22 -0600
Subject: [PATCH] fix: add $@ to scripts where needed (#614)

* fix: add $@ to scripts where needed

This change updates the scripts to allow for user input where needed.

Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>

* feat: add steps to setup-openstack.sh

Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>

---------

Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
---
 bin/install-libvirt.sh           |  5 +++++
 bin/install-memcached.sh         |  3 +++
 bin/install-postgres-operator.sh |  6 +++++-
 bin/install-skyline.sh           |  2 +-
 bin/setup-openstack.sh           | 12 ++++++++++++
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/bin/install-libvirt.sh b/bin/install-libvirt.sh
index 3e592d82..2079b552 100755
--- a/bin/install-libvirt.sh
+++ b/bin/install-libvirt.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=SC2124,SC2145,SC2294
 
 # Directory to check for YAML files
 CONFIG_DIR="/etc/genestack/helm-configs/libvirt"
@@ -21,7 +22,11 @@ if compgen -G "${CONFIG_DIR}/*.yaml" > /dev/null; then
     done
 fi
 
+HELM_CMD+="${@}"
+
 # Run the helm command
+echo "Executing Helm command:"
+echo "${HELM_CMD}"
 eval "${HELM_CMD}"
 
 popd || exit
diff --git a/bin/install-memcached.sh b/bin/install-memcached.sh
index 6889f45e..97e115e5 100755
--- a/bin/install-memcached.sh
+++ b/bin/install-memcached.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=SC2124,SC2145,SC2294
 
 # Default parameter value
 TARGET=${1:-base}
@@ -22,6 +23,8 @@ if compgen -G "${CONFIG_DIR}/*.yaml" > /dev/null; then
     done
 fi
 
+HELM_CMD+="${@}"
+
 # Run the helm command
 echo "Executing Helm command:"
 echo "${HELM_CMD}"
diff --git a/bin/install-postgres-operator.sh b/bin/install-postgres-operator.sh
index e392598e..bc07069c 100755
--- a/bin/install-postgres-operator.sh
+++ b/bin/install-postgres-operator.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=SC2124,SC2145,SC2294
 
 # Directory to check for YAML files
 CONFIG_DIR="/etc/genestack/helm-configs/postgres-operator"
@@ -22,8 +23,11 @@ if compgen -G "${CONFIG_DIR}/*.yaml" > /dev/null; then
     done
 fi
 
+HELM_CMD+="${@}"
+
 # Run the helm command
-eval "${HELM_CMD}"
+echo "Executing Helm command:"
 echo "${HELM_CMD}"
+eval "${HELM_CMD}"
 
 popd || exit
diff --git a/bin/install-skyline.sh b/bin/install-skyline.sh
index c6814534..6d1e358d 100755
--- a/bin/install-skyline.sh
+++ b/bin/install-skyline.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-kubectl --namespace openstack apply -k /etc/genestack/kustomize/skyline/overlay
+kubectl --namespace openstack apply -k /etc/genestack/kustomize/skyline/overlay "$@"
diff --git a/bin/setup-openstack.sh b/bin/setup-openstack.sh
index 4276dfa9..670a36a5 100755
--- a/bin/setup-openstack.sh
+++ b/bin/setup-openstack.sh
@@ -2,12 +2,18 @@
 #Deploy Keystone
 /opt/genestack/bin/install-keystone.sh
 
+# Deploy Barbican
+/opt/genestack/bin/install-barbican.sh
+
 # Deploy Glance
 /opt/genestack/bin/install-glance.sh
 
 # Deploy Heat
 /opt/genestack/bin/install-heat.sh
 
+# Deploy Magnum
+/opt/genestack/bin/install-magnum.sh
+
 # Deploy Cinder
 /opt/genestack/bin/install-cinder.sh
 
@@ -25,3 +31,9 @@
 
 # Deploy SkyLine
 /opt/genestack/bin/install-skyline.sh
+
+# Deploy Ceilometer
+/opt/genestack/bin/install-ceilometer.sh
+
+# Deploy Gnocchi
+/opt/genestack/bin/install-gnocchi.sh