openstack
/
magnum
Code Issues Proposed changes

Merge "Make k8s cloud config consistent"

This commit is contained in:
Jenkins 2016-10-13 11:41:10 +00:00 committed by Gerrit Code Review
parent 1b43b61098 eb495d469b
commit 846852a854
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh
View File

@ -12,8 +12,8 @@ AUTH_URL=$(echo "$AUTH_URL" | sed 's/v3/v2.0/')
cat > $KUBE_OS_CLOUD_CONFIG <<EOF
[Global]
auth-url=$AUTH_URL
Username=$USERNAME
Password=$PASSWORD
username=$USERNAME
password=$PASSWORD
tenant-name=$TENANT_NAME
[LoadBalancer]
subnet-id=$CLUSTER_SUBNET