From a76097e5358a30ee22611c30f7a519650eb6009c Mon Sep 17 00:00:00 2001 From: ztetfger Date: Thu, 14 Jul 2016 16:03:07 +0800 Subject: [PATCH] Fix bug for write-kube-os-config.sh In file write-kube-os-config.sh, the bug is in line below AUTH_URL=$(echo "$AUTH_URL" | tr -s "v3" "v2") this command is used to change v3 to v2,but it will change any "3" to "2". For example: AUTH_URL=10.43.166.108:5000/v3 it will be changed to 10.42.166.108:5000/v2, where 43 is also changed to 42. Change-Id: Ia329b983ba59856783f2873722c9ade418d49cea Closes-Bug: #1599703 --- .../k8s_coreos_v1/templates/fragments/write-kube-os-config.sh | 2 +- .../templates/fragments/write-kube-os-config.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/write-kube-os-config.sh b/magnum/drivers/k8s_coreos_v1/templates/fragments/write-kube-os-config.sh index 27fa71c6a1..8e3cfc66ed 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/fragments/write-kube-os-config.sh +++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/write-kube-os-config.sh @@ -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 diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/fragments/write-kube-os-config.sh b/magnum/drivers/k8s_fedora_atomic_v1/templates/fragments/write-kube-os-config.sh index 27fa71c6a1..8e3cfc66ed 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/fragments/write-kube-os-config.sh +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/fragments/write-kube-os-config.sh @@ -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