openstack
/
magnum
Code Issues Proposed changes

Fix for k8s bay creation stall 

Some keystone auth requests respond with whitespace characters that
our cloud-init scripts do not handle properly. This patch removes the
problematic whitespace before the auth token is used.

Co-Authored By: Dolph Mathews <dolph.mathews@gmail.com>
Change-Id: I921a82a1ab61d8adc07be28370351092198742a1
Closes-bug: 1603240
This commit is contained in:
Adrian Otto 2016-07-14 23:20:45 +00:00
parent 8111e0c635
commit 1726957d52
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
magnum/drivers/k8s_coreos_v1/templates/fragments/make-cert-client.sh
View File

@ -62,8 +62,10 @@ EOF
#trust is introduced in Keystone v3 version
AUTH_URL=${AUTH_URL/v2.0/v3}
USER_TOKEN=`curl -s -i -X POST -H "Content-Type: application/json" -d "$auth_json" \
$AUTH_URL/auth/tokens | grep X-Subject-Token | awk '{print $2}'`
content_type='Content-Type: application/json'
url="$AUTH_URL/auth/tokens"
USER_TOKEN=`curl -s -i -X POST -H "$content_type" -d "$auth_json" $url \
| grep X-Subject-Token | awk '{print $2}' | tr -d '[[:space:]]'`
# Get CA certificate for this bay
curl -X GET \

6
magnum/drivers/k8s_coreos_v1/templates/fragments/make-cert.sh
View File

@ -82,8 +82,10 @@ EOF
#trust is introduced in Keystone v3 version
AUTH_URL=${AUTH_URL/v2.0/v3}
USER_TOKEN=`curl -s -i -X POST -H "Content-Type: application/json" -d "$auth_json" \
$AUTH_URL/auth/tokens | grep X-Subject-Token | awk '{print $2}'`
content_type='Content-Type: application/json'
url="$AUTH_URL/auth/tokens"
USER_TOKEN=`curl -s -i -X POST -H "$content_type" -d "$auth_json" $url \
| grep X-Subject-Token | awk '{print $2}' | tr -d '[[:space:]]'`
# Get CA certificate for this bay
curl -X GET \

6
magnum/drivers/k8s_fedora_atomic_v1/templates/fragments/make-cert-client.sh
View File

@ -62,8 +62,10 @@ EOF
#trust is introduced in Keystone v3 version
AUTH_URL=${AUTH_URL/v2.0/v3}
USER_TOKEN=`curl -s -i -X POST -H "Content-Type: application/json" -d "$auth_json" \
$AUTH_URL/auth/tokens | grep X-Subject-Token | awk '{print $2}'`
content_type='Content-Type: application/json'
url="$AUTH_URL/auth/tokens"
USER_TOKEN=`curl -s -i -X POST -H "$content_type" -d "$auth_json" $url \
| grep X-Subject-Token | awk '{print $2}' | tr -d '[[:space:]]'`
# Get CA certificate for this bay
curl -X GET \

6
magnum/drivers/k8s_fedora_atomic_v1/templates/fragments/make-cert.sh
View File

@ -69,8 +69,10 @@ EOF
#trust is introduced in Keystone v3 version
AUTH_URL=${AUTH_URL/v2.0/v3}
USER_TOKEN=`curl -s -i -X POST -H "Content-Type: application/json" -d "$auth_json" \
$AUTH_URL/auth/tokens | grep X-Subject-Token | awk '{print $2}'`
content_type='Content-Type: application/json'
url="$AUTH_URL/auth/tokens"
USER_TOKEN=`curl -s -i -X POST -H "$content_type" -d "$auth_json" $url \
| grep X-Subject-Token | awk '{print $2}' | tr -d '[[:space:]]'`
# Get CA certificate for this bay
curl -X GET \