openstack
/
magnum
Code Issues Proposed changes

Merge "Fix bug for write-kube-os-config.sh"

This commit is contained in:
Jenkins 2016-07-15 17:29:12 +00:00 committed by Gerrit Code Review
parent c2916bb600 a76097e535
commit 2c58c09f1a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/drivers/k8s_coreos_v1/templates/fragments/write-kube-os-config.sh
View File

@ -5,7 +5,7 @@
KUBE_OS_CLOUD_CONFIG=/etc/sysconfig/kube_openstack_config
# kubernetes backend only support keystone v2 at this point
AUTH_URL=$(echo "$AUTH_URL" | tr -s "v3" "v2")
AUTH_URL=$(echo "$AUTH_URL" | sed 's/v3/v2/')
# Generate a the configuration for Kubernetes services
# to talk to OpenStack Neutron

2
magnum/drivers/k8s_fedora_atomic_v1/templates/fragments/write-kube-os-config.sh
View File

@ -5,7 +5,7 @@
KUBE_OS_CLOUD_CONFIG=/etc/sysconfig/kube_openstack_config
# kubernetes backend only support keystone v2 at this point
AUTH_URL=$(echo "$AUTH_URL" | tr -s "v3" "v2")
AUTH_URL=$(echo "$AUTH_URL" | sed 's/v3/v2/')
# Generate a the configuration for Kubernetes services
# to talk to OpenStack Neutron