Skip to content

Commit 4c97684

Browse files
rackerchrisrackerchris
authored
fix: (install-scripts) correctly allow for additional flags (#928)
1 parent 40905fc commit 4c97684

16 files changed

+44
-13
lines changed

‎bin/install-barbican.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,13 @@ HELM_CMD+=" --set endpoints.oslo_cache.auth.memcache_secret_key=\"$(kubectl --na
2929
HELM_CMD+=" --set conf.barbican.keystone_authtoken.memcache_secret_key=\"$(kubectl --namespace openstack get secret os-memcached -o jsonpath='{.data.memcache_secret_key}' | base64 -d)\""
3030

3131
HELM_CMD+=" --post-renderer /etc/genestack/kustomize/kustomize.sh"
32-
HELM_CMD+=" --post-renderer-args barbican/overlay $*"
32+
HELM_CMD+=" --post-renderer-args barbican/overlay"
3333

3434
helm repo add openstack-helm https://tarballs.opendev.org/openstack/openstack-helm
3535
helm repo update
3636

37+
HELM_CMD+=" $@"
38+
3739
echo "Executing Helm command:"
3840
echo "${HELM_CMD}"
3941
eval "${HELM_CMD}"

‎bin/install-ceilometer.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,13 @@ rabbit://octavia:\$(kubectl --namespace openstack get secret octavia-rabbitmq-pa
4242
rabbit://magnum:\$(kubectl --namespace openstack get secret magnum-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)@rabbitmq.openstack.svc.cluster.local:5672/magnum}\""
4343

4444
HELM_CMD+=" --post-renderer /etc/genestack/kustomize/kustomize.sh"
45-
HELM_CMD+=" --post-renderer-args ceilometer/overlay $*"
45+
HELM_CMD+=" --post-renderer-args ceilometer/overlay"
4646

4747
helm repo add openstack-helm https://tarballs.opendev.org/openstack/openstack-helm
4848
helm repo update
4949

50+
HELM_CMD+=" $@"
51+
5052
echo "Executing Helm command:"
5153
echo "${HELM_CMD}"
5254
eval "${HELM_CMD}"

‎bin/install-cinder.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,13 @@ HELM_CMD+=" --set endpoints.oslo_messaging.auth.admin.password=\"\$(kubectl --na
2929
HELM_CMD+=" --set endpoints.oslo_messaging.auth.cinder.password=\"\$(kubectl --namespace openstack get secret cinder-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)\""
3030

3131
HELM_CMD+=" --post-renderer /etc/genestack/kustomize/kustomize.sh"
32-
HELM_CMD+=" --post-renderer-args cinder/overlay $*"
32+
HELM_CMD+=" --post-renderer-args cinder/overlay"
3333

3434
helm repo add openstack-helm https://tarballs.opendev.org/openstack/openstack-helm
3535
helm repo update
3636

37+
HELM_CMD+=" $@"
38+
3739
echo "Executing Helm command:"
3840
echo "${HELM_CMD}"
3941
eval "${HELM_CMD}"

‎bin/install-glance.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,13 @@ HELM_CMD+=" --set endpoints.oslo_messaging.auth.admin.password=\"\$(kubectl --na
2929
HELM_CMD+=" --set endpoints.oslo_messaging.auth.glance.password=\"\$(kubectl --namespace openstack get secret glance-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)\""
3030

3131
HELM_CMD+=" --post-renderer /etc/genestack/kustomize/kustomize.sh"
32-
HELM_CMD+=" --post-renderer-args glance/overlay $*"
32+
HELM_CMD+=" --post-renderer-args glance/overlay"
3333

3434
helm repo add openstack-helm https://tarballs.opendev.org/openstack/openstack-helm
3535
helm repo update
3636

37+
HELM_CMD+=" $@"
38+
3739
echo "Executing Helm command:"
3840
echo "${HELM_CMD}"
3941
eval "${HELM_CMD}"

‎bin/install-gnocchi.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,13 @@ HELM_CMD+=" --set endpoints.oslo_db_postgresql.auth.admin.password=\"\$(kubectl
2929
HELM_CMD+=" --set endpoints.oslo_db_postgresql.auth.gnocchi.password=\"\$(kubectl --namespace openstack get secret gnocchi-pgsql-password -o jsonpath='{.data.password}' | base64 -d)\""
3030

3131
HELM_CMD+=" --post-renderer /etc/genestack/kustomize/kustomize.sh"
32-
HELM_CMD+=" --post-renderer-args gnocchi/overlay $*"
32+
HELM_CMD+=" --post-renderer-args gnocchi/overlay"
3333

3434
helm repo add openstack-helm-infra https://tarballs.opendev.org/openstack/openstack-helm-infra
3535
helm repo update
3636

37+
HELM_CMD+=" $@"
38+
3739
echo "Executing Helm command:"
3840
echo "${HELM_CMD}"
3941
eval "${HELM_CMD}"

‎bin/install-heat.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@ HELM_CMD+=" --set endpoints.oslo_messaging.auth.admin.password=\"\$(kubectl --na
3131
HELM_CMD+=" --set endpoints.oslo_messaging.auth.heat.password=\"\$(kubectl --namespace openstack get secret heat-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)\""
3232

3333
HELM_CMD+=" --post-renderer /etc/genestack/kustomize/kustomize.sh"
34-
HELM_CMD+=" --post-renderer-args heat/overlay $*"
34+
HELM_CMD+=" --post-renderer-args heat/overlay"
3535

3636
helm repo add openstack-helm https://tarballs.opendev.org/openstack/openstack-helm
3737
helm repo update
3838

39+
HELM_CMD+=" $@"
40+
3941
echo "Executing Helm command:"
4042
echo "${HELM_CMD}"
4143
eval "${HELM_CMD}"

‎bin/install-horizon.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@ HELM_CMD+=" --set endpoints.oslo_db.auth.admin.password=\"\$(kubectl --namespace
2828
HELM_CMD+=" --set endpoints.oslo_db.auth.horizon.password=\"\$(kubectl --namespace openstack get secret horizon-db-password -o jsonpath='{.data.password}' | base64 -d)\""
2929

3030
HELM_CMD+=" --post-renderer /etc/genestack/kustomize/kustomize.sh"
31-
HELM_CMD+=" --post-renderer-args horizon/overlay $*"
31+
HELM_CMD+=" --post-renderer-args horizon/overlay"
3232

3333
helm repo add openstack-helm https://tarballs.opendev.org/openstack/openstack-helm
3434
helm repo update
3535

36+
HELM_CMD+=" $@"
37+
3638
echo "Executing Helm command:"
3739
echo "${HELM_CMD}"
3840
eval "${HELM_CMD}"

‎bin/install-keystone.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,13 @@ HELM_CMD+=" --set endpoints.oslo_messaging.auth.admin.password=\"\$(kubectl --na
3030
HELM_CMD+=" --set endpoints.oslo_messaging.auth.keystone.password=\"\$(kubectl --namespace openstack get secret keystone-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)\""
3131

3232
HELM_CMD+=" --post-renderer /etc/genestack/kustomize/kustomize.sh"
33-
HELM_CMD+=" --post-renderer-args keystone/overlay $*"
33+
HELM_CMD+=" --post-renderer-args keystone/overlay"
3434

3535
helm repo add openstack-helm https://tarballs.opendev.org/openstack/openstack-helm
3636
helm repo update
3737

38+
HELM_CMD+=" $@"
39+
3840
echo "Executing Helm command:"
3941
echo "${HELM_CMD}"
4042
eval "${HELM_CMD}"

‎bin/install-kube-ovn.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ for dir in "$GLOBAL_OVERRIDES_DIR" "$SERVICE_CONFIG_DIR"; do
3737
fi
3838
done
3939

40+
4041
HELM_CMD+=" $@"
4142

4243
echo "Executing Helm command:"

‎bin/install-magnum.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@ HELM_CMD+=" --set endpoints.oslo_cache.auth.memcache_secret_key=\"\$(kubectl --n
3131
HELM_CMD+=" --set conf.magnum.keystone_authtoken.memcache_secret_key=\"\$(kubectl --namespace openstack get secret os-memcached -o jsonpath='{.data.memcache_secret_key}' | base64 -d)\""
3232

3333
HELM_CMD+=" --post-renderer /etc/genestack/kustomize/kustomize.sh"
34-
HELM_CMD+=" --post-renderer-args magnum/overlay $*"
34+
HELM_CMD+=" --post-renderer-args magnum/overlay"
3535

3636
helm repo add openstack-helm https://tarballs.opendev.org/openstack/openstack-helm
3737
helm repo update
3838

39+
HELM_CMD+=" $@"
40+
3941
echo "Executing Helm command:"
4042
echo "${HELM_CMD}"
4143
eval "${HELM_CMD}"

‎bin/install-neutron.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,13 @@ HELM_CMD+=" --set conf.plugins.ml2_conf.ovn.ovn_nb_connection=\"tcp:\$(kubectl -
4242
HELM_CMD+=" --set conf.plugins.ml2_conf.ovn.ovn_sb_connection=\"tcp:\$(kubectl --namespace kube-system get service ovn-sb -o jsonpath='{.spec.clusterIP}:{.spec.ports[0].port}')\""
4343

4444
HELM_CMD+=" --post-renderer /etc/genestack/kustomize/kustomize.sh"
45-
HELM_CMD+=" --post-renderer-args neutron/overlay $*"
45+
HELM_CMD+=" --post-renderer-args neutron/overlay"
4646

4747
helm repo add openstack-helm https://tarballs.opendev.org/openstack/openstack-helm
4848
helm repo update
4949

50+
HELM_CMD+=" $@"
51+
5052
echo "Executing Helm command:"
5153
echo "${HELM_CMD}"
5254
eval "${HELM_CMD}"

‎bin/install-nova.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,13 @@ HELM_CMD+=" --set network.ssh.public_key=\"\$(kubectl -n openstack get secret no
4545
HELM_CMD+=" --set network.ssh.private_key=\"\$(kubectl -n openstack get secret nova-ssh-keypair -o jsonpath='{.data.private_key}' | base64 -d)\"\$'\n'"
4646

4747
HELM_CMD+=" --post-renderer /etc/genestack/kustomize/kustomize.sh"
48-
HELM_CMD+=" --post-renderer-args nova/overlay $*"
48+
HELM_CMD+=" --post-renderer-args nova/overlay"
4949

5050
helm repo add openstack-helm https://tarballs.opendev.org/openstack/openstack-helm
5151
helm repo update
5252

53+
HELM_CMD+=" $@"
54+
5355
echo "Executing Helm command:"
5456
echo "${HELM_CMD}"
5557
eval "${HELM_CMD}"

‎bin/install-octavia.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,13 @@ HELM_CMD+=" --set conf.octavia.ovn.ovn_nb_connection=\"tcp:\$(kubectl --namespac
3535
HELM_CMD+=" --set conf.octavia.ovn.ovn_sb_connection=\"tcp:\$(kubectl --namespace kube-system get service ovn-sb -o jsonpath='{.spec.clusterIP}:{.spec.ports[0].port}')\""
3636

3737
HELM_CMD+=" --post-renderer /etc/genestack/kustomize/kustomize.sh"
38-
HELM_CMD+=" --post-renderer-args octavia/overlay $*"
38+
HELM_CMD+=" --post-renderer-args octavia/overlay"
3939

4040
helm repo add openstack-helm https://tarballs.opendev.org/openstack/openstack-helm
4141
helm repo update
4242

43+
HELM_CMD+=" $@"
44+
4345
echo "Executing Helm command:"
4446
echo "${HELM_CMD}"
4547
eval "${HELM_CMD}"

‎bin/install-placement.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ HELM_CMD+=" --set conf.placement.keystone_authtoken.memcache_secret_key=\"\$(kub
3131
HELM_CMD+=" --set conf.placement.placement_database.slave_connection=\"mysql+pymysql://placement:\$(kubectl --namespace openstack get secret placement-db-password -o jsonpath='{.data.password}' | base64 -d)@mariadb-cluster-secondary.openstack.svc.cluster.local:3306/placement\""
3232

3333
HELM_CMD+=" --post-renderer /etc/genestack/kustomize/kustomize.sh"
34-
HELM_CMD+=" --post-renderer-args placement/overlay $*"
34+
HELM_CMD+=" --post-renderer-args placement/overlay"
35+
36+
HELM_CMD+=" $@"
3537

3638
echo "Executing Helm command:"
3739
echo "${HELM_CMD}"

‎bin/install-sealed-secrets.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ if compgen -G "${CONFIG_DIR}/*.yaml" > /dev/null; then
2222
done
2323
fi
2424

25+
HELM_CMD+=" $@"
26+
2527
# Run the helm command
2628
echo "Executing Helm command:"
2729
echo "${HELM_CMD}"

‎bin/install-topolvm.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ if compgen -G "${CONFIG_DIR}/*.yaml" > /dev/null; then
2626
done
2727
fi
2828

29+
HELM_CMD+=" $@"
30+
2931
# Run the helm command
3032
echo "Executing Helm command:"
3133
echo "${HELM_CMD}"

0 commit comments

Comments
 (0)