github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove needless env var in OpenStack provider 

Since `TENANT_NAME` is unique if we use keystone v2 api,
so `TENANT_ID` is not needed if `TENANT_NAME` is provided
to configure OpenStack provider.
And also to set `TENANT_ID` is annoying to develop, because
`TENANT_ID` is not static by each environment.
This patch remove dependency of `TENANT_ID` and simply use
`TENANT_NAME`.
pull/6/head
OTSUKA, Yuanying 2016-12-09 11:09:58 +09:00
parent 53caa61c20
commit d5e039c947
6 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/openstack-heat/kubernetes-heat/fragments/configure-salt.yaml
View File

@ -32,7 +32,7 @@ write_files:
username=$OS_USERNAME
password=$OS_PASSWORD
region=$OS_REGION_NAME
tenant-id=$OS_TENANT_ID
tenant-name=$OS_TENANT_NAME
[LoadBalancer]
lb-version=$LBAAS_VERSION
subnet-id=$SUBNET_ID

8
cluster/openstack-heat/kubernetes-heat/kubecluster.yaml
View File

@ -106,9 +106,9 @@ parameters:
description: OpenStack Region Name
default: false
os_tenant_id:
os_tenant_name:
type: string
description: OpenStack Tenant ID
description: OpenStack Tenant Name
default: false
enable_proxy:
@ -296,7 +296,7 @@ resources:
"$OS_USERNAME": {get_param: os_username}
"$OS_PASSWORD": {get_param: os_password}
"$OS_REGION_NAME": {get_param: os_region_name}
"$OS_TENANT_ID": {get_param: os_tenant_id}
"$OS_TENANT_NAME": {get_param: os_tenant_name}
"$LBAAS_VERSION": {get_param: lbaas_version}
"$SUBNET_ID": {get_resource: fixed_subnet}
"$FLOATING_NETWORK_ID": {get_attr: [kube_master_floating, floating_network_id]}
@ -401,7 +401,7 @@ resources:
os_username: {get_param: os_username}
os_password: {get_param: os_password}
os_region_name: {get_param: os_region_name}
os_tenant_id: {get_param: os_tenant_id}
os_tenant_name: {get_param: os_tenant_name}
enable_proxy: {get_param: enable_proxy }
ftp_proxy: {get_param: ftp_proxy }
http_proxy: {get_param: http_proxy }

6
cluster/openstack-heat/kubernetes-heat/kubeminion.yaml
View File

@ -61,9 +61,9 @@ parameters:
description: OpenStack Region Name
default: false
os_tenant_id:
os_tenant_name:
type: string
description: OpenStack Tenant ID
description: OpenStack Tenant Name
default: false
enable_proxy:
@ -213,7 +213,7 @@ resources:
"$OS_USERNAME": {get_param: os_username}
"$OS_PASSWORD": {get_param: os_password}
"$OS_REGION_NAME": {get_param: os_region_name}
"$OS_TENANT_ID": {get_param: os_tenant_id}
"$OS_TENANT_NAME": {get_param: os_tenant_name}
"$role": "kubernetes-pool"
run_salt:

1
cluster/openstack-heat/openrc-default.sh
View File

@ -22,5 +22,4 @@ export OS_USERNAME=${OS_USERNAME:-admin}
export OS_PASSWORD=${OS_PASSWORD:-secretsecret}
export OS_AUTH_URL=${OS_AUTH_URL:-http://192.168.123.100:5000/v2.0}
export OS_TENANT_NAME=${OS_TENANT_NAME:-admin}
export OS_TENANT_ID=${OS_TENANT_ID:-ed51b98b40944d89a449592eb67431eb}
export OS_REGION_NAME=${OS_REGION_NAME:-RegionOne}

1
cluster/openstack-heat/openrc-swift.sh
View File

@ -23,5 +23,4 @@ export OS_USERNAME=${OS_USERNAME:-admin}
export OS_PASSWORD=${OS_PASSWORD:-secretsecret}
export OS_AUTH_URL=${OS_AUTH_URL:-http://192.168.123.100:5000/v2.0}
export OS_TENANT_NAME=${OS_TENANT_NAME:-admin}
export OS_TENANT_ID=${OS_TENANT_ID:-ed51b98b40944d89a449592eb67431eb}
export OS_REGION_NAME=${OS_REGION_NAME:-RegionOne}

2
cluster/openstack-heat/util.sh
View File

@ -217,7 +217,7 @@ function run-heat-script() {
--parameter os_username=${OS_USERNAME} \
--parameter os_password=${OS_PASSWORD} \
--parameter os_region_name=${OS_REGION_NAME} \
--parameter os_tenant_id=${OS_TENANT_ID} \
--parameter os_tenant_name=${OS_TENANT_NAME} \
--parameter enable_proxy=${ENABLE_PROXY} \
--parameter ftp_proxy="${FTP_PROXY}" \
--parameter http_proxy="${HTTP_PROXY}" \