openstack/magnum
Code Issues Proposed changes

[suse] Rename bay to cluster

Browse Source 
Change-Id: If09e50508c26b8f489a55b9b5453c2ae5744e672
Implements: blueprint rename-bay-to-cluster
Partial-Bug: #1622949
This commit is contained in:
yatin 2016-09-14 15:57:40 +05:30
parent e8dc23c42e
commit 735db5401a
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/drivers/k8s_opensuse_v1/template_def.py
View File

@ -34,18 +34,18 @@ class JeOSK8sTemplateDefinition(k8s_template_def.K8sTemplateDefinition):
self.add_parameter('docker_volume_size', self.add_parameter('docker_volume_size',
cluster_template_attr='docker_volume_size') cluster_template_attr='docker_volume_size')
self.add_output('kube_minions', self.add_output('kube_minions',
bay_attr='node_addresses') cluster_attr='node_addresses')
self.add_output('kube_masters', 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 = kwargs.pop('extra_params', {})
extra_params['username'] = context.user_name extra_params['username'] = context.user_name
extra_params['tenant_name'] = context.tenant extra_params['tenant_name'] = context.tenant
return super(JeOSK8sTemplateDefinition, return super(JeOSK8sTemplateDefinition,
self).get_params(context, cluster_template, bay, self).get_params(context, cluster_template, cluster,
extra_params=extra_params, extra_params=extra_params,
**kwargs) **kwargs)

2
contrib/drivers/k8s_opensuse_v1/templates/fragments/write-heat-params-master.yaml
View File

@ -21,5 +21,5 @@ write_files:
TENANT_NAME="$TENANT_NAME" TENANT_NAME="$TENANT_NAME"
CLUSTER_SUBNET="$CLUSTER_SUBNET" CLUSTER_SUBNET="$CLUSTER_SUBNET"
TLS_DISABLED="$TLS_DISABLED" TLS_DISABLED="$TLS_DISABLED"
BAY_UUID="$BAY_UUID" CLUSTER_UUID="$CLUSTER_UUID"
MAGNUM_URL="$MAGNUM_URL" MAGNUM_URL="$MAGNUM_URL"

2
contrib/drivers/k8s_opensuse_v1/templates/fragments/write-heat-params.yaml
View File

@ -24,7 +24,7 @@ write_files:
REGISTRY_INSECURE="$REGISTRY_INSECURE" REGISTRY_INSECURE="$REGISTRY_INSECURE"
REGISTRY_CHUNKSIZE="$REGISTRY_CHUNKSIZE" REGISTRY_CHUNKSIZE="$REGISTRY_CHUNKSIZE"
TLS_DISABLED="$TLS_DISABLED" TLS_DISABLED="$TLS_DISABLED"
BAY_UUID="$BAY_UUID" CLUSTER_UUID="$CLUSTER_UUID"
MAGNUM_URL="$MAGNUM_URL" MAGNUM_URL="$MAGNUM_URL"
HTTP_PROXY="$HTTP_PROXY" HTTP_PROXY="$HTTP_PROXY"
HTTPS_PROXY="$HTTPS_PROXY" HTTPS_PROXY="$HTTPS_PROXY"

8
contrib/drivers/k8s_opensuse_v1/templates/kubecluster.yaml
View File

@ -220,9 +220,9 @@ parameters:
service. service.
default: 6443 default: 6443
bay_uuid: cluster_uuid:
type: string type: string
description: identifier for the bay this template is generating description: identifier for the cluster this template is generating
magnum_url: magnum_url:
type: string type: string
@ -411,7 +411,7 @@ resources:
flannel_network_subnetlen: {get_param: flannel_network_subnetlen} flannel_network_subnetlen: {get_param: flannel_network_subnetlen}
portal_network_cidr: {get_param: portal_network_cidr} portal_network_cidr: {get_param: portal_network_cidr}
discovery_url: {get_param: discovery_url} discovery_url: {get_param: discovery_url}
bay_uuid: {get_param: bay_uuid} cluster_uuid: {get_param: cluster_uuid}
magnum_url: {get_param: magnum_url} magnum_url: {get_param: magnum_url}
fixed_network: {get_resource: fixed_network} fixed_network: {get_resource: fixed_network}
fixed_subnet: {get_resource: fixed_subnet} fixed_subnet: {get_resource: fixed_subnet}
@ -466,7 +466,7 @@ resources:
registry_container: {get_param: registry_container} registry_container: {get_param: registry_container}
registry_insecure: {get_param: registry_insecure} registry_insecure: {get_param: registry_insecure}
registry_chunksize: {get_param: registry_chunksize} registry_chunksize: {get_param: registry_chunksize}
bay_uuid: {get_param: bay_uuid} cluster_uuid: {get_param: cluster_uuid}
magnum_url: {get_param: magnum_url} magnum_url: {get_param: magnum_url}
kubernetes_port: {get_param: kubernetes_port} kubernetes_port: {get_param: kubernetes_port}
tls_disabled: {get_param: tls_disabled} tls_disabled: {get_param: tls_disabled}

6
contrib/drivers/k8s_opensuse_v1/templates/kubemaster.yaml
View File

@ -73,9 +73,9 @@ parameters:
service. service.
default: 6443 default: 6443
bay_uuid: cluster_uuid:
type: string type: string
description: identifier for the bay this template is generating description: identifier for the cluster this template is generating
magnum_url: magnum_url:
type: string type: string
@ -172,7 +172,7 @@ resources:
"$TENANT_NAME": {get_param: tenant_name} "$TENANT_NAME": {get_param: tenant_name}
"$CLUSTER_SUBNET": {get_param: fixed_subnet} "$CLUSTER_SUBNET": {get_param: fixed_subnet}
"$TLS_DISABLED": {get_param: tls_disabled} "$TLS_DISABLED": {get_param: tls_disabled}
"$BAY_UUID": {get_param: bay_uuid} "$CLUSTER_UUID": {get_param: cluster_uuid}
"$MAGNUM_URL": {get_param: magnum_url} "$MAGNUM_URL": {get_param: magnum_url}
configure_etcd: configure_etcd:

6
contrib/drivers/k8s_opensuse_v1/templates/kubeminion.yaml
View File

@ -52,9 +52,9 @@ parameters:
service. service.
default: 6443 default: 6443
bay_uuid: cluster_uuid:
type: string type: string
description: identifier for the bay this template is generating description: identifier for the cluster this template is generating
magnum_url: magnum_url:
type: string type: string
@ -193,7 +193,7 @@ resources:
$REGISTRY_INSECURE: {get_param: registry_insecure} $REGISTRY_INSECURE: {get_param: registry_insecure}
$REGISTRY_CHUNKSIZE: {get_param: registry_chunksize} $REGISTRY_CHUNKSIZE: {get_param: registry_chunksize}
$TLS_DISABLED: {get_param: tls_disabled} $TLS_DISABLED: {get_param: tls_disabled}
$BAY_UUID: {get_param: bay_uuid} $CLUSTER_UUID: {get_param: cluster_uuid}
$MAGNUM_URL: {get_param: magnum_url} $MAGNUM_URL: {get_param: magnum_url}
$NODE_FIXED_IP: {get_attr: [kube_minion_eth0, fixed_ips, 0, ip_address]} $NODE_FIXED_IP: {get_attr: [kube_minion_eth0, fixed_ips, 0, ip_address]}