openstack
/
magnum
Code Issues Proposed changes

Merge "Remove carriage return when getting user token"

This commit is contained in:
Jenkins 2017-02-09 00:28:14 +00:00 committed by Gerrit Code Review
parent 3d43c27b2b e154970558
commit 270faf8050
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/make-cert-client.yaml
View File

@ -80,7 +80,7 @@ write_files:
#trust is introduced in Keystone v3 version
AUTH_URL=${AUTH_URL/v2.0/v3}
USER_TOKEN=`curl -k -s -i -X POST -H "Content-Type: application/json" -d @auth.json \
$AUTH_URL/auth/tokens | grep X-Subject-Token | awk '{print $2}'`
$AUTH_URL/auth/tokens | grep X-Subject-Token | awk '{print $2}' | tr -d '\r'`
rm -rf auth.json

2
magnum/drivers/k8s_coreos_v1/templates/fragments/make-cert.yaml
View File

@ -103,7 +103,7 @@ write_files:
#trust is introduced in Keystone v3 version
AUTH_URL=${AUTH_URL/v2.0/v3}
USER_TOKEN=`curl -k -s -i -X POST -H "Content-Type: application/json" -d @auth.json \
$AUTH_URL/auth/tokens | grep X-Subject-Token | awk '{print $2}'`
$AUTH_URL/auth/tokens | grep X-Subject-Token | awk '{print $2}' | tr -d '\r'`
rm -rf auth.json