From 735db5401af2060fb39c9492cf130f699aac1ef5 Mon Sep 17 00:00:00 2001 From: yatin Date: Wed, 14 Sep 2016 15:57:40 +0530 Subject: [PATCH] [suse] Rename bay to cluster Change-Id: If09e50508c26b8f489a55b9b5453c2ae5744e672 Implements: blueprint rename-bay-to-cluster Partial-Bug: #1622949 --- contrib/drivers/k8s_opensuse_v1/template_def.py | 8 ++++---- .../templates/fragments/write-heat-params-master.yaml | 2 +- .../templates/fragments/write-heat-params.yaml | 2 +- .../drivers/k8s_opensuse_v1/templates/kubecluster.yaml | 8 ++++---- contrib/drivers/k8s_opensuse_v1/templates/kubemaster.yaml | 6 +++--- contrib/drivers/k8s_opensuse_v1/templates/kubeminion.yaml | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/contrib/drivers/k8s_opensuse_v1/template_def.py b/contrib/drivers/k8s_opensuse_v1/template_def.py index 55161d3687..5fa9a834a2 100644 --- a/contrib/drivers/k8s_opensuse_v1/template_def.py +++ b/contrib/drivers/k8s_opensuse_v1/template_def.py @@ -34,18 +34,18 @@ class JeOSK8sTemplateDefinition(k8s_template_def.K8sTemplateDefinition): self.add_parameter('docker_volume_size', cluster_template_attr='docker_volume_size') self.add_output('kube_minions', - bay_attr='node_addresses') + cluster_attr='node_addresses') self.add_output('kube_masters', - bay_attr='master_addresses') + cluster_attr='master_addresses') - def get_params(self, context, cluster_template, bay, **kwargs): + def get_params(self, context, cluster_template, cluster, **kwargs): extra_params = kwargs.pop('extra_params', {}) extra_params['username'] = context.user_name extra_params['tenant_name'] = context.tenant return super(JeOSK8sTemplateDefinition, - self).get_params(context, cluster_template, bay, + self).get_params(context, cluster_template, cluster, extra_params=extra_params, **kwargs) diff --git a/contrib/drivers/k8s_opensuse_v1/templates/fragments/write-heat-params-master.yaml b/contrib/drivers/k8s_opensuse_v1/templates/fragments/write-heat-params-master.yaml index 27c479f8ec..f2df4415d2 100644 --- a/contrib/drivers/k8s_opensuse_v1/templates/fragments/write-heat-params-master.yaml +++ b/contrib/drivers/k8s_opensuse_v1/templates/fragments/write-heat-params-master.yaml @@ -21,5 +21,5 @@ write_files: TENANT_NAME="$TENANT_NAME" CLUSTER_SUBNET="$CLUSTER_SUBNET" TLS_DISABLED="$TLS_DISABLED" - BAY_UUID="$BAY_UUID" + CLUSTER_UUID="$CLUSTER_UUID" MAGNUM_URL="$MAGNUM_URL" diff --git a/contrib/drivers/k8s_opensuse_v1/templates/fragments/write-heat-params.yaml b/contrib/drivers/k8s_opensuse_v1/templates/fragments/write-heat-params.yaml index 6a6d5c5230..ac5886a02a 100644 --- a/contrib/drivers/k8s_opensuse_v1/templates/fragments/write-heat-params.yaml +++ b/contrib/drivers/k8s_opensuse_v1/templates/fragments/write-heat-params.yaml @@ -24,7 +24,7 @@ write_files: REGISTRY_INSECURE="$REGISTRY_INSECURE" REGISTRY_CHUNKSIZE="$REGISTRY_CHUNKSIZE" TLS_DISABLED="$TLS_DISABLED" - BAY_UUID="$BAY_UUID" + CLUSTER_UUID="$CLUSTER_UUID" MAGNUM_URL="$MAGNUM_URL" HTTP_PROXY="$HTTP_PROXY" HTTPS_PROXY="$HTTPS_PROXY" diff --git a/contrib/drivers/k8s_opensuse_v1/templates/kubecluster.yaml b/contrib/drivers/k8s_opensuse_v1/templates/kubecluster.yaml index d32a28ef6c..159dbb00eb 100644 --- a/contrib/drivers/k8s_opensuse_v1/templates/kubecluster.yaml +++ b/contrib/drivers/k8s_opensuse_v1/templates/kubecluster.yaml @@ -220,9 +220,9 @@ parameters: service. default: 6443 - bay_uuid: + cluster_uuid: type: string - description: identifier for the bay this template is generating + description: identifier for the cluster this template is generating magnum_url: type: string @@ -411,7 +411,7 @@ resources: flannel_network_subnetlen: {get_param: flannel_network_subnetlen} portal_network_cidr: {get_param: portal_network_cidr} discovery_url: {get_param: discovery_url} - bay_uuid: {get_param: bay_uuid} + cluster_uuid: {get_param: cluster_uuid} magnum_url: {get_param: magnum_url} fixed_network: {get_resource: fixed_network} fixed_subnet: {get_resource: fixed_subnet} @@ -466,7 +466,7 @@ resources: registry_container: {get_param: registry_container} registry_insecure: {get_param: registry_insecure} registry_chunksize: {get_param: registry_chunksize} - bay_uuid: {get_param: bay_uuid} + cluster_uuid: {get_param: cluster_uuid} magnum_url: {get_param: magnum_url} kubernetes_port: {get_param: kubernetes_port} tls_disabled: {get_param: tls_disabled} diff --git a/contrib/drivers/k8s_opensuse_v1/templates/kubemaster.yaml b/contrib/drivers/k8s_opensuse_v1/templates/kubemaster.yaml index bd2cc42b0b..e2e070abe5 100644 --- a/contrib/drivers/k8s_opensuse_v1/templates/kubemaster.yaml +++ b/contrib/drivers/k8s_opensuse_v1/templates/kubemaster.yaml @@ -73,9 +73,9 @@ parameters: service. default: 6443 - bay_uuid: + cluster_uuid: type: string - description: identifier for the bay this template is generating + description: identifier for the cluster this template is generating magnum_url: type: string @@ -172,7 +172,7 @@ resources: "$TENANT_NAME": {get_param: tenant_name} "$CLUSTER_SUBNET": {get_param: fixed_subnet} "$TLS_DISABLED": {get_param: tls_disabled} - "$BAY_UUID": {get_param: bay_uuid} + "$CLUSTER_UUID": {get_param: cluster_uuid} "$MAGNUM_URL": {get_param: magnum_url} configure_etcd: diff --git a/contrib/drivers/k8s_opensuse_v1/templates/kubeminion.yaml b/contrib/drivers/k8s_opensuse_v1/templates/kubeminion.yaml index ae1c5a9a60..4ce4814be4 100644 --- a/contrib/drivers/k8s_opensuse_v1/templates/kubeminion.yaml +++ b/contrib/drivers/k8s_opensuse_v1/templates/kubeminion.yaml @@ -52,9 +52,9 @@ parameters: service. default: 6443 - bay_uuid: + cluster_uuid: type: string - description: identifier for the bay this template is generating + description: identifier for the cluster this template is generating magnum_url: type: string @@ -193,7 +193,7 @@ resources: $REGISTRY_INSECURE: {get_param: registry_insecure} $REGISTRY_CHUNKSIZE: {get_param: registry_chunksize} $TLS_DISABLED: {get_param: tls_disabled} - $BAY_UUID: {get_param: bay_uuid} + $CLUSTER_UUID: {get_param: cluster_uuid} $MAGNUM_URL: {get_param: magnum_url} $NODE_FIXED_IP: {get_attr: [kube_minion_eth0, fixed_ips, 0, ip_address]}