Merge "Update ceph development scripts"

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}

tools/deployment/developer/ceph/000-install-packages.sh

@@ -1 +1 @@
-../common/000-install-packages.sh
+../../common/install-packages.sh

tools/deployment/developer/ceph/010-deploy-k8s.sh

@@ -1 +1 @@
-../common/010-deploy-k8s.sh
+../../common/deploy-k8s.sh

tools/deployment/developer/ceph/011-deploy-k8s-kubeadm.sh

@@ -0,0 +1 @@
+../../common/deploy-k8s-kubeadm.sh

tools/deployment/developer/ceph/020-setup-client.sh

@@ -1 +1 @@
-../common/020-setup-client.sh
+../../common/setup-client.sh

tools/deployment/developer/ceph/030-ingress.sh

@@ -1 +1 @@
-../common/030-ingress.sh
+../../component/common/ingress.sh