From c047fce569272fd56208e1b64909210bf5940d06 Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Mon, 6 Nov 2023 10:34:20 -0600
Subject: [PATCH] Fix path for setup-client.sh script

Change-Id: Ieb7549d2f00d981efa1d4bc2d6d8a57a067ef6c7
---
 tools/deployment/common/setup-client.sh | 58 +++++++++++++++++++++++++
 zuul.d/jobs.yaml                        |  6 +--
 2 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100755 tools/deployment/common/setup-client.sh

diff --git a/tools/deployment/common/setup-client.sh b/tools/deployment/common/setup-client.sh
new file mode 100755
index 000000000..b870d4c6d
--- /dev/null
+++ b/tools/deployment/common/setup-client.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+set -xe
+
+sudo -H -E pip3 install --upgrade pip
+sudo -H -E pip3 install \
+  -c${UPPER_CONSTRAINTS_FILE:=https://releases.openstack.org/constraints/upper/${OPENSTACK_RELEASE:-xena}} \
+  cmd2 python-openstackclient python-heatclient --ignore-installed
+
+export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
+
+sudo -H mkdir -p /etc/openstack
+sudo -H chown -R $(id -un): /etc/openstack
+FEATURE_GATE="tls"; if [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])${FEATURE_GATE}($|[[:space:]]) ]]; then
+  tee /etc/openstack/clouds.yaml << EOF
+  clouds:
+    openstack_helm:
+      region_name: RegionOne
+      identity_api_version: 3
+      cacert: /etc/openstack-helm/certs/ca/ca.pem
+      auth:
+        username: 'admin'
+        password: 'password'
+        project_name: 'admin'
+        project_domain_name: 'default'
+        user_domain_name: 'default'
+        auth_url: 'https://keystone.openstack.svc.cluster.local/v3'
+EOF
+else
+  tee /etc/openstack/clouds.yaml << EOF
+  clouds:
+    openstack_helm:
+      region_name: RegionOne
+      identity_api_version: 3
+      auth:
+        username: 'admin'
+        password: 'password'
+        project_name: 'admin'
+        project_domain_name: 'default'
+        user_domain_name: 'default'
+        auth_url: 'http://keystone.openstack.svc.cluster.local/v3'
+EOF
+fi
+
+#NOTE: Build helm-toolkit, most charts depend on helm-toolkit
+make -C ${HELM_CHART_ROOT_PATH} helm-toolkit
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 7dd7d40ac..fadf0c4a2 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -201,7 +201,7 @@
         - ./tools/deployment/openstack-support/040-memcached.sh
         - ./tools/deployment/openstack-support/050-libvirt.sh
         - ./tools/deployment/openstack-support/060-openvswitch.sh
-        - ./tools/deployment/openstack-support/080-setup-client.sh
+        - ./tools/deployment/common/setup-client.sh
         - ./tools/deployment/openstack-support/090-keystone.sh
         - ./tools/deployment/openstack-support/100-ceph-radosgateway.sh
         - ./tools/deployment/openstack-support/110-openstack-exporter.sh
@@ -228,7 +228,7 @@
         - ./tools/deployment/openstack-support-rook/040-memcached.sh
         - ./tools/deployment/openstack-support-rook/050-libvirt.sh
         - ./tools/deployment/openstack-support-rook/060-openvswitch.sh
-        - ./tools/deployment/openstack-support-rook/080-setup-client.sh
+        - ./tools/deployment/common/setup-client.sh
         - ./tools/deployment/openstack-support-rook/090-keystone.sh
         - ./tools/deployment/openstack-support-rook/100-ceph-radosgateway.sh
         - ./tools/deployment/openstack-support-rook/110-openstack-exporter.sh
@@ -257,7 +257,7 @@
         - ./tools/deployment/openstack-support/040-memcached.sh
         - ./tools/deployment/openstack-support/051-libvirt-ssl.sh
         - ./tools/deployment/openstack-support/060-openvswitch.sh
-        - ./tools/deployment/openstack-support/080-setup-client.sh
+        - ./tools/deployment/common/setup-client.sh
         - ./tools/deployment/openstack-support/090-keystone.sh
         - ./tools/deployment/openstack-support/100-ceph-radosgateway.sh
         - ./tools/deployment/openstack-support/110-openstack-exporter.sh