Skip to content

Commit

Permalink
fix: satisfy linter for SC2164 & SC2068
Browse files Browse the repository at this point in the history
  • Loading branch information
LukeRepko committed Nov 4, 2024
1 parent bed42ed commit fccbde7
Show file tree
Hide file tree
Showing 14 changed files with 41 additions and 40 deletions.
6 changes: 3 additions & 3 deletions bin/install-barbican.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
pushd /opt/genestack/submodules/openstack-helm
pushd /opt/genestack/submodules/openstack-helm || exit
helm upgrade --install barbican ./barbican \
--namespace=openstack \
--timeout 120m \
Expand All @@ -13,5 +13,5 @@ pushd /opt/genestack/submodules/openstack-helm
--set endpoints.oslo_cache.auth.memcache_secret_key="$(kubectl --namespace openstack get secret os-memcached -o jsonpath='{.data.memcache_secret_key}' | base64 -d)" \
--set conf.barbican.keystone_authtoken.memcache_secret_key="$(kubectl --namespace openstack get secret os-memcached -o jsonpath='{.data.memcache_secret_key}' | base64 -d)" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args barbican/base $@
popd
--post-renderer-args barbican/base "$@"
popd || exit
6 changes: 3 additions & 3 deletions bin/install-ceilometer.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
pushd /opt/genestack/submodules/openstack-helm
pushd /opt/genestack/submodules/openstack-helm || exit
helm upgrade --install ceilometer ./ceilometer \
--namespace=openstack \
--timeout 10m \
Expand All @@ -23,5 +23,5 @@ pushd /opt/genestack/submodules/openstack-helm
rabbit://neutron:$(kubectl --namespace openstack get secret neutron-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)@rabbitmq.openstack.svc.cluster.local:5672/neutron,\
rabbit://nova:$(kubectl --namespace openstack get secret nova-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)@rabbitmq.openstack.svc.cluster.local:5672/nova}" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args ceilometer/base $@
popd
--post-renderer-args ceilometer/base "$@"
popd || exit
6 changes: 3 additions & 3 deletions bin/install-cinder.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
pushd /opt/genestack/submodules/openstack-helm
pushd /opt/genestack/submodules/openstack-helm || exit
helm upgrade --install cinder ./cinder \
--namespace=openstack \
--timeout 120m \
Expand All @@ -14,5 +14,5 @@ pushd /opt/genestack/submodules/openstack-helm
--set endpoints.oslo_messaging.auth.admin.password="$(kubectl --namespace openstack get secret rabbitmq-default-user -o jsonpath='{.data.password}' | base64 -d)" \
--set endpoints.oslo_messaging.auth.cinder.password="$(kubectl --namespace openstack get secret cinder-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args cinder/base $@
popd
--post-renderer-args cinder/base "$@"
popd || exit
6 changes: 3 additions & 3 deletions bin/install-glance.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
pushd /opt/genestack/submodules/openstack-helm
pushd /opt/genestack/submodules/openstack-helm || exit
helm upgrade --install glance ./glance \
--namespace=openstack \
--timeout 120m \
Expand All @@ -14,5 +14,5 @@ pushd /opt/genestack/submodules/openstack-helm
--set endpoints.oslo_messaging.auth.admin.password="$(kubectl --namespace openstack get secret rabbitmq-default-user -o jsonpath='{.data.password}' | base64 -d)" \
--set endpoints.oslo_messaging.auth.glance.password="$(kubectl --namespace openstack get secret glance-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args glance/base $@
popd
--post-renderer-args glance/base "$@"
popd || exit
6 changes: 3 additions & 3 deletions bin/install-gnocchi.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
pushd /opt/genestack/submodules/openstack-helm-infra
pushd /opt/genestack/submodules/openstack-helm-infra || exit
helm upgrade --install gnocchi ./gnocchi \
--namespace=openstack \
--timeout 10m \
Expand All @@ -14,5 +14,5 @@ pushd /opt/genestack/submodules/openstack-helm-infra
--set endpoints.oslo_db_postgresql.auth.admin.password="$(kubectl --namespace openstack get secret postgresql-db-admin -o jsonpath='{.data.password}' | base64 -d)" \
--set endpoints.oslo_db_postgresql.auth.gnocchi.password="$(kubectl --namespace openstack get secret gnocchi-pgsql-password -o jsonpath='{.data.password}' | base64 -d)" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args gnocchi/base $@
popd
--post-renderer-args gnocchi/base "$@"
popd || exit
6 changes: 3 additions & 3 deletions bin/install-heat.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
pushd /opt/genestack/submodules/openstack-helm
pushd /opt/genestack/submodules/openstack-helm || exit
helm upgrade --install heat ./heat \
--namespace=openstack \
--timeout 120m \
Expand All @@ -16,5 +16,5 @@ pushd /opt/genestack/submodules/openstack-helm
--set endpoints.oslo_messaging.auth.admin.password="$(kubectl --namespace openstack get secret rabbitmq-default-user -o jsonpath='{.data.password}' | base64 -d)" \
--set endpoints.oslo_messaging.auth.heat.password="$(kubectl --namespace openstack get secret heat-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args heat/base $@
popd
--post-renderer-args heat/base "$@"
popd || exit
6 changes: 3 additions & 3 deletions bin/install-horizon.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
pushd /opt/genestack/submodules/openstack-helm
pushd /opt/genestack/submodules/openstack-helm || exit
helm upgrade --install horizon ./horizon \
--namespace=openstack \
--timeout 120m \
Expand All @@ -10,5 +10,5 @@ pushd /opt/genestack/submodules/openstack-helm
--set endpoints.oslo_db.auth.admin.password="$(kubectl --namespace openstack get secret mariadb -o jsonpath='{.data.root-password}' | base64 -d)" \
--set endpoints.oslo_db.auth.horizon.password="$(kubectl --namespace openstack get secret horizon-db-password -o jsonpath='{.data.password}' | base64 -d)" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args horizon/base $@
popd
--post-renderer-args horizon/base "$@"
popd || exit
6 changes: 3 additions & 3 deletions bin/install-keystone.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
pushd /opt/genestack/submodules/openstack-helm
pushd /opt/genestack/submodules/openstack-helm || exit
helm upgrade --install keystone ./keystone \
--namespace=openstack \
--timeout 120m \
Expand All @@ -12,5 +12,5 @@ pushd /opt/genestack/submodules/openstack-helm
--set endpoints.oslo_messaging.auth.admin.password="$(kubectl --namespace openstack get secret rabbitmq-default-user -o jsonpath='{.data.password}' | base64 -d)" \
--set endpoints.oslo_messaging.auth.keystone.password="$(kubectl --namespace openstack get secret keystone-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args keystone/base $@
popd
--post-renderer-args keystone/base "$@"
popd || exit
6 changes: 3 additions & 3 deletions bin/install-magnum.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
pushd /opt/genestack/submodules/openstack-helm
pushd /opt/genestack/submodules/openstack-helm || exit
helm upgrade --install magnum ./magnum \
--namespace=openstack \
--timeout 120m \
Expand All @@ -13,5 +13,5 @@ pushd /opt/genestack/submodules/openstack-helm
--set endpoints.oslo_cache.auth.memcache_secret_key="$(kubectl --namespace openstack get secret os-memcached -o jsonpath='{.data.memcache_secret_key}' | base64 -d)" \
--set conf.magnum.keystone_authtoken.memcache_secret_key="$(kubectl --namespace openstack get secret os-memcached -o jsonpath='{.data.memcache_secret_key}' | base64 -d)" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args magnum/base $@
popd
--post-renderer-args magnum/base "$@"
popd || exit
6 changes: 3 additions & 3 deletions bin/install-neutron.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
pushd /opt/genestack/submodules/openstack-helm
pushd /opt/genestack/submodules/openstack-helm || exit
helm upgrade --install neutron ./neutron \
--namespace=openstack \
--timeout 120m \
Expand All @@ -24,5 +24,5 @@ pushd /opt/genestack/submodules/openstack-helm
--set conf.plugins.ml2_conf.ovn.ovn_nb_connection="tcp:$(kubectl --namespace kube-system get service ovn-nb -o jsonpath='{.spec.clusterIP}:{.spec.ports[0].port}')" \
--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}')" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args neutron/base $@
popd
--post-renderer-args neutron/base "$@"
popd || exit
6 changes: 3 additions & 3 deletions bin/install-nova.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
pushd /opt/genestack/submodules/openstack-helm
pushd /opt/genestack/submodules/openstack-helm || exit
helm upgrade --install nova ./nova \
--namespace=openstack \
--timeout 120m \
Expand Down Expand Up @@ -27,5 +27,5 @@ pushd /opt/genestack/submodules/openstack-helm
--set network.ssh.public_key="$(kubectl -n openstack get secret nova-ssh-keypair -o jsonpath='{.data.public_key}' | base64 -d)"$'\n' \
--set network.ssh.private_key="$(kubectl -n openstack get secret nova-ssh-keypair -o jsonpath='{.data.private_key}' | base64 -d)"$'\n' \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args nova/base $@
popd
--post-renderer-args nova/base "$@"
popd || exit
6 changes: 3 additions & 3 deletions bin/install-octavia.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
pushd /opt/genestack/submodules/openstack-helm
pushd /opt/genestack/submodules/openstack-helm || exit
helm upgrade --install octavia ./octavia \
--namespace=openstack \
--timeout 120m \
Expand All @@ -17,5 +17,5 @@ pushd /opt/genestack/submodules/openstack-helm
--set conf.octavia.ovn.ovn_nb_connection="tcp:$(kubectl --namespace kube-system get service ovn-nb -o jsonpath='{.spec.clusterIP}:{.spec.ports[0].port}')" \
--set conf.octavia.ovn.ovn_sb_connection="tcp:$(kubectl --namespace kube-system get service ovn-sb -o jsonpath='{.spec.clusterIP}:{.spec.ports[0].port}')" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args octavia/base $@
popd
--post-renderer-args octavia/base "$@"
popd || exit
6 changes: 3 additions & 3 deletions bin/install-placement.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
pushd /opt/genestack/submodules/openstack-helm
pushd /opt/genestack/submodules/openstack-helm || exit
helm upgrade --install placement ./placement --namespace=openstack \
--namespace=openstack \
--timeout 120m \
Expand All @@ -13,5 +13,5 @@ pushd /opt/genestack/submodules/openstack-helm
--set conf.placement.keystone_authtoken.memcache_secret_key="$(kubectl --namespace openstack get secret os-memcached -o jsonpath='{.data.memcache_secret_key}' | base64 -d)" \
--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" \
--post-renderer /etc/genestack/kustomize/kustomize.sh \
--post-renderer-args placement/base $@
popd
--post-renderer-args placement/base "$@"
popd || exit
3 changes: 2 additions & 1 deletion bin/install-postgresql.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
cd /opt/genestack/submodules/openstack-helm-infra
pushd /opt/genestack/submodules/openstack-helm-infra || exit
helm upgrade --install postgresql ./postgresql \
--namespace=openstack \
--wait \
Expand All @@ -10,3 +10,4 @@ helm upgrade --install postgresql ./postgresql \
--set endpoints.postgresql.auth.admin.password="$(kubectl --namespace openstack get secret postgresql-db-admin -o jsonpath='{.data.password}' | base64 -d)" \
--set endpoints.postgresql.auth.exporter.password="$(kubectl --namespace openstack get secret postgresql-db-exporter -o jsonpath='{.data.password}' | base64 -d)" \
--set endpoints.postgresql.auth.audit.password="$(kubectl --namespace openstack get secret postgresql-db-audit -o jsonpath='{.data.password}' | base64 -d)"
popd || exit

0 comments on commit fccbde7

Please sign in to comment.