From 5345b2a8127b5afa85496a208667b48666a8e70e Mon Sep 17 00:00:00 2001
From: Gage Hugo <gagehugo@gmail.com>
Date: Tue, 30 Nov 2021 20:23:25 -0600
Subject: [PATCH] Reduce duplicated memcache scripts

This change reduces the amount of scripts used to deploy memcache
down to one by removing a duplicate and pointing the symlink
to the component script.

Change-Id: Ia127666cf89c8823ffb3ba2b5ebe7d62afa5f82b
---
 tools/deployment/baremetal/060-memcached.sh   |  2 +-
 tools/deployment/common/memcached.sh          | 32 -------------------
 .../developer/ceph/070-memcached.sh           |  2 +-
 .../deployment/developer/nfs/070-memcached.sh |  2 +-
 tools/deployment/multinode/070-memcached.sh   |  2 +-
 5 files changed, 4 insertions(+), 36 deletions(-)
 delete mode 100755 tools/deployment/common/memcached.sh

diff --git a/tools/deployment/baremetal/060-memcached.sh b/tools/deployment/baremetal/060-memcached.sh
index 9592670f70..831ed16f17 120000
--- a/tools/deployment/baremetal/060-memcached.sh
+++ b/tools/deployment/baremetal/060-memcached.sh
@@ -1 +1 @@
-../common/memcached.sh
\ No newline at end of file
+../component/common/memcached.sh
\ No newline at end of file
diff --git a/tools/deployment/common/memcached.sh b/tools/deployment/common/memcached.sh
deleted file mode 100755
index fd2cc36bc9..0000000000
--- a/tools/deployment/common/memcached.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/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
-
-#NOTE: Get the over-rides to use
-export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
-: ${OSH_EXTRA_HELM_ARGS_MEMCACHED:="$(./tools/deployment/common/get-values-overrides.sh memcached)"}
-
-#NOTE: Lint and package chart
-make -C ${HELM_CHART_ROOT_PATH} memcached
-
-#NOTE: Deploy command
-: ${OSH_EXTRA_HELM_ARGS:=""}
-helm upgrade --install memcached ${HELM_CHART_ROOT_PATH}/memcached \
-    --namespace=openstack \
-    ${OSH_EXTRA_HELM_ARGS} \
-    ${OSH_EXTRA_HELM_ARGS_MEMCACHED}
-
-#NOTE: Wait for deploy
-./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/developer/ceph/070-memcached.sh b/tools/deployment/developer/ceph/070-memcached.sh
index bbd749d7fc..cb6ef9a043 120000
--- a/tools/deployment/developer/ceph/070-memcached.sh
+++ b/tools/deployment/developer/ceph/070-memcached.sh
@@ -1 +1 @@
-../../common/memcached.sh
\ No newline at end of file
+../../component/common/memcached.sh
\ No newline at end of file
diff --git a/tools/deployment/developer/nfs/070-memcached.sh b/tools/deployment/developer/nfs/070-memcached.sh
index bbd749d7fc..cb6ef9a043 120000
--- a/tools/deployment/developer/nfs/070-memcached.sh
+++ b/tools/deployment/developer/nfs/070-memcached.sh
@@ -1 +1 @@
-../../common/memcached.sh
\ No newline at end of file
+../../component/common/memcached.sh
\ No newline at end of file
diff --git a/tools/deployment/multinode/070-memcached.sh b/tools/deployment/multinode/070-memcached.sh
index 9592670f70..831ed16f17 120000
--- a/tools/deployment/multinode/070-memcached.sh
+++ b/tools/deployment/multinode/070-memcached.sh
@@ -1 +1 @@
-../common/memcached.sh
\ No newline at end of file
+../component/common/memcached.sh
\ No newline at end of file