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
This commit is contained in:
parent
12afaa53ee
commit
5345b2a812
@ -1 +1 @@
|
|||||||
../common/memcached.sh
|
../component/common/memcached.sh
|
@ -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
|
|
@ -1 +1 @@
|
|||||||
../../common/memcached.sh
|
../../component/common/memcached.sh
|
@ -1 +1 @@
|
|||||||
../../common/memcached.sh
|
../../component/common/memcached.sh
|
@ -1 +1 @@
|
|||||||
../common/memcached.sh
|
../component/common/memcached.sh
|
Loading…
Reference in New Issue
Block a user