From 402a013e8f1eb164e77dc80a303c6997edbda560 Mon Sep 17 00:00:00 2001 From: Gage Hugo Date: Wed, 16 Feb 2022 10:23:21 -0600 Subject: [PATCH] Update ceph development scripts With the move to helm v3, several of the development scripts are either out of date or are linked to ones that are. This change updates several of the symlinks and scripts that exist under the ceph development directory to bring them up-to-date with the current state of the repository. Change-Id: I15b431d5301d47c6c83513e356c0c819d2c50963 --- tools/deployment/common/deploy-k8s-kubeadm.sh | 21 +++++++++++++++++++ .../developer/ceph/000-install-packages.sh | 2 +- .../developer/ceph/010-deploy-k8s.sh | 2 +- .../developer/ceph/011-deploy-k8s-kubeadm.sh | 1 + .../developer/ceph/020-setup-client.sh | 2 +- .../deployment/developer/ceph/030-ingress.sh | 2 +- 6 files changed, 26 insertions(+), 4 deletions(-) create mode 100755 tools/deployment/common/deploy-k8s-kubeadm.sh create mode 120000 tools/deployment/developer/ceph/011-deploy-k8s-kubeadm.sh diff --git a/tools/deployment/common/deploy-k8s-kubeadm.sh b/tools/deployment/common/deploy-k8s-kubeadm.sh new file mode 100755 index 00000000..6f2a06ca --- /dev/null +++ b/tools/deployment/common/deploy-k8s-kubeadm.sh @@ -0,0 +1,21 @@ +#!/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 + +CURRENT_DIR="$(pwd)" +: ${OSH_INFRA_PATH:="../openstack-helm-infra"} +cd ${OSH_INFRA_PATH} +./tools/gate/deploy-k8s-kubeadm.sh +cd ${CURRENT_DIR} diff --git a/tools/deployment/developer/ceph/000-install-packages.sh b/tools/deployment/developer/ceph/000-install-packages.sh index d702c489..8ad28d13 120000 --- a/tools/deployment/developer/ceph/000-install-packages.sh +++ b/tools/deployment/developer/ceph/000-install-packages.sh @@ -1 +1 @@ -../common/000-install-packages.sh \ No newline at end of file +../../common/install-packages.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/010-deploy-k8s.sh b/tools/deployment/developer/ceph/010-deploy-k8s.sh index f7b06f9d..3cb1bb90 120000 --- a/tools/deployment/developer/ceph/010-deploy-k8s.sh +++ b/tools/deployment/developer/ceph/010-deploy-k8s.sh @@ -1 +1 @@ -../common/010-deploy-k8s.sh \ No newline at end of file +../../common/deploy-k8s.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/011-deploy-k8s-kubeadm.sh b/tools/deployment/developer/ceph/011-deploy-k8s-kubeadm.sh new file mode 120000 index 00000000..882b6c1f --- /dev/null +++ b/tools/deployment/developer/ceph/011-deploy-k8s-kubeadm.sh @@ -0,0 +1 @@ +../../common/deploy-k8s-kubeadm.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/020-setup-client.sh b/tools/deployment/developer/ceph/020-setup-client.sh index 877014f6..5ba93361 120000 --- a/tools/deployment/developer/ceph/020-setup-client.sh +++ b/tools/deployment/developer/ceph/020-setup-client.sh @@ -1 +1 @@ -../common/020-setup-client.sh \ No newline at end of file +../../common/setup-client.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/030-ingress.sh b/tools/deployment/developer/ceph/030-ingress.sh index bf3835b6..70976836 120000 --- a/tools/deployment/developer/ceph/030-ingress.sh +++ b/tools/deployment/developer/ceph/030-ingress.sh @@ -1 +1 @@ -../common/030-ingress.sh \ No newline at end of file +../../component/common/ingress.sh \ No newline at end of file