diff --git a/tools/deployment/common/deploy-k8s-kubeadm.sh b/tools/deployment/common/deploy-k8s-kubeadm.sh new file mode 100755 index 0000000000..6f2a06cace --- /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 d702c48993..8ad28d13b0 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 f7b06f9dde..3cb1bb90fa 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 0000000000..882b6c1f5b --- /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 877014f6ac..5ba93361cd 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 bf3835b6ce..7097683624 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