From 5ea2940cfe722b369f175c36d4dfe3a39a6dc96a Mon Sep 17 00:00:00 2001 From: OHTAKE Tomohiro Date: Mon, 25 Apr 2016 10:43:30 +0900 Subject: [PATCH] Rename the provider to openstack-heat There might be several methods to deploy a Kubernetes cluster on OpenStack. It is better to name the provider more specific. --- cluster/{openstack => openstack-heat}/config-default.sh | 0 cluster/{openstack => openstack-heat}/config-image.sh | 0 cluster/{openstack => openstack-heat}/config-test.sh | 2 +- .../kubernetes-heat/fragments/configure-proxy.sh | 0 .../kubernetes-heat/fragments/configure-salt.yaml | 0 .../fragments/deploy-kube-auth-files-master.yaml | 0 .../kubernetes-heat/fragments/deploy-kube-auth-files-node.yaml | 0 .../kubernetes-heat/fragments/kube-user.yaml | 0 .../kubernetes-heat/fragments/provision-network-master.sh | 0 .../kubernetes-heat/fragments/provision-network-node.sh | 0 .../kubernetes-heat/fragments/run-salt.sh | 0 .../kubernetes-heat/fragments/write-heat-params.yaml | 0 .../kubernetes-heat/kubecluster.yaml | 0 .../kubernetes-heat/kubeminion.yaml | 0 cluster/{openstack => openstack-heat}/openrc-default.sh | 0 cluster/{openstack => openstack-heat}/openrc-swift.sh | 0 cluster/{openstack => openstack-heat}/util.sh | 0 17 files changed, 1 insertion(+), 1 deletion(-) rename cluster/{openstack => openstack-heat}/config-default.sh (100%) rename cluster/{openstack => openstack-heat}/config-image.sh (100%) rename cluster/{openstack => openstack-heat}/config-test.sh (92%) rename cluster/{openstack => openstack-heat}/kubernetes-heat/fragments/configure-proxy.sh (100%) rename cluster/{openstack => openstack-heat}/kubernetes-heat/fragments/configure-salt.yaml (100%) rename cluster/{openstack => openstack-heat}/kubernetes-heat/fragments/deploy-kube-auth-files-master.yaml (100%) rename cluster/{openstack => openstack-heat}/kubernetes-heat/fragments/deploy-kube-auth-files-node.yaml (100%) rename cluster/{openstack => openstack-heat}/kubernetes-heat/fragments/kube-user.yaml (100%) rename cluster/{openstack => openstack-heat}/kubernetes-heat/fragments/provision-network-master.sh (100%) rename cluster/{openstack => openstack-heat}/kubernetes-heat/fragments/provision-network-node.sh (100%) rename cluster/{openstack => openstack-heat}/kubernetes-heat/fragments/run-salt.sh (100%) rename cluster/{openstack => openstack-heat}/kubernetes-heat/fragments/write-heat-params.yaml (100%) rename cluster/{openstack => openstack-heat}/kubernetes-heat/kubecluster.yaml (100%) rename cluster/{openstack => openstack-heat}/kubernetes-heat/kubeminion.yaml (100%) rename cluster/{openstack => openstack-heat}/openrc-default.sh (100%) rename cluster/{openstack => openstack-heat}/openrc-swift.sh (100%) rename cluster/{openstack => openstack-heat}/util.sh (100%) diff --git a/cluster/openstack/config-default.sh b/cluster/openstack-heat/config-default.sh similarity index 100% rename from cluster/openstack/config-default.sh rename to cluster/openstack-heat/config-default.sh diff --git a/cluster/openstack/config-image.sh b/cluster/openstack-heat/config-image.sh similarity index 100% rename from cluster/openstack/config-image.sh rename to cluster/openstack-heat/config-image.sh diff --git a/cluster/openstack/config-test.sh b/cluster/openstack-heat/config-test.sh similarity index 92% rename from cluster/openstack/config-test.sh rename to cluster/openstack-heat/config-test.sh index 1ed3e5eedf4..0787d55e7bb 100644 --- a/cluster/openstack/config-test.sh +++ b/cluster/openstack-heat/config-test.sh @@ -16,4 +16,4 @@ ## Contains configuration values for interacting with the Ubuntu cluster in test mode KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. -source "${KUBE_ROOT}/cluster/openstack/config-default.sh" +source "${KUBE_ROOT}/cluster/openstack-heat/config-default.sh" diff --git a/cluster/openstack/kubernetes-heat/fragments/configure-proxy.sh b/cluster/openstack-heat/kubernetes-heat/fragments/configure-proxy.sh similarity index 100% rename from cluster/openstack/kubernetes-heat/fragments/configure-proxy.sh rename to cluster/openstack-heat/kubernetes-heat/fragments/configure-proxy.sh diff --git a/cluster/openstack/kubernetes-heat/fragments/configure-salt.yaml b/cluster/openstack-heat/kubernetes-heat/fragments/configure-salt.yaml similarity index 100% rename from cluster/openstack/kubernetes-heat/fragments/configure-salt.yaml rename to cluster/openstack-heat/kubernetes-heat/fragments/configure-salt.yaml diff --git a/cluster/openstack/kubernetes-heat/fragments/deploy-kube-auth-files-master.yaml b/cluster/openstack-heat/kubernetes-heat/fragments/deploy-kube-auth-files-master.yaml similarity index 100% rename from cluster/openstack/kubernetes-heat/fragments/deploy-kube-auth-files-master.yaml rename to cluster/openstack-heat/kubernetes-heat/fragments/deploy-kube-auth-files-master.yaml diff --git a/cluster/openstack/kubernetes-heat/fragments/deploy-kube-auth-files-node.yaml b/cluster/openstack-heat/kubernetes-heat/fragments/deploy-kube-auth-files-node.yaml similarity index 100% rename from cluster/openstack/kubernetes-heat/fragments/deploy-kube-auth-files-node.yaml rename to cluster/openstack-heat/kubernetes-heat/fragments/deploy-kube-auth-files-node.yaml diff --git a/cluster/openstack/kubernetes-heat/fragments/kube-user.yaml b/cluster/openstack-heat/kubernetes-heat/fragments/kube-user.yaml similarity index 100% rename from cluster/openstack/kubernetes-heat/fragments/kube-user.yaml rename to cluster/openstack-heat/kubernetes-heat/fragments/kube-user.yaml diff --git a/cluster/openstack/kubernetes-heat/fragments/provision-network-master.sh b/cluster/openstack-heat/kubernetes-heat/fragments/provision-network-master.sh similarity index 100% rename from cluster/openstack/kubernetes-heat/fragments/provision-network-master.sh rename to cluster/openstack-heat/kubernetes-heat/fragments/provision-network-master.sh diff --git a/cluster/openstack/kubernetes-heat/fragments/provision-network-node.sh b/cluster/openstack-heat/kubernetes-heat/fragments/provision-network-node.sh similarity index 100% rename from cluster/openstack/kubernetes-heat/fragments/provision-network-node.sh rename to cluster/openstack-heat/kubernetes-heat/fragments/provision-network-node.sh diff --git a/cluster/openstack/kubernetes-heat/fragments/run-salt.sh b/cluster/openstack-heat/kubernetes-heat/fragments/run-salt.sh similarity index 100% rename from cluster/openstack/kubernetes-heat/fragments/run-salt.sh rename to cluster/openstack-heat/kubernetes-heat/fragments/run-salt.sh diff --git a/cluster/openstack/kubernetes-heat/fragments/write-heat-params.yaml b/cluster/openstack-heat/kubernetes-heat/fragments/write-heat-params.yaml similarity index 100% rename from cluster/openstack/kubernetes-heat/fragments/write-heat-params.yaml rename to cluster/openstack-heat/kubernetes-heat/fragments/write-heat-params.yaml diff --git a/cluster/openstack/kubernetes-heat/kubecluster.yaml b/cluster/openstack-heat/kubernetes-heat/kubecluster.yaml similarity index 100% rename from cluster/openstack/kubernetes-heat/kubecluster.yaml rename to cluster/openstack-heat/kubernetes-heat/kubecluster.yaml diff --git a/cluster/openstack/kubernetes-heat/kubeminion.yaml b/cluster/openstack-heat/kubernetes-heat/kubeminion.yaml similarity index 100% rename from cluster/openstack/kubernetes-heat/kubeminion.yaml rename to cluster/openstack-heat/kubernetes-heat/kubeminion.yaml diff --git a/cluster/openstack/openrc-default.sh b/cluster/openstack-heat/openrc-default.sh similarity index 100% rename from cluster/openstack/openrc-default.sh rename to cluster/openstack-heat/openrc-default.sh diff --git a/cluster/openstack/openrc-swift.sh b/cluster/openstack-heat/openrc-swift.sh similarity index 100% rename from cluster/openstack/openrc-swift.sh rename to cluster/openstack-heat/openrc-swift.sh diff --git a/cluster/openstack/util.sh b/cluster/openstack-heat/util.sh similarity index 100% rename from cluster/openstack/util.sh rename to cluster/openstack-heat/util.sh