From 7c6d005eedbff90811d0ded26508f716227dc5f8 Mon Sep 17 00:00:00 2001 From: JordanP Date: Mon, 6 Oct 2014 23:08:50 +0200 Subject: [PATCH] Fix account rc files creation for Swift users Id02ebdfa5cb3f6c763293876c6bb031184ebd663 introduced a small regression which makes the command x509-create-cert fail with 'ERROR (CommandError): Invalid OpenStack Nova credentials.' for Swift users. The handling of specific password for Swift users was introduced in Ifb57a43aad439ffe041e98465719a8a8eceae544 Change-Id: I3f328b1358bad0bdf7056796eabfe846dd5bae3a --- lib/swift | 8 +++++--- tools/create_userrc.sh | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/swift b/lib/swift index 21ed920149..15bd2a9471 100644 --- a/lib/swift +++ b/lib/swift @@ -557,9 +557,11 @@ function create_swift_disk { function create_swift_accounts { # Defines specific passwords used by tools/create_userrc.sh - local swiftusertest1_password=testing - local swiftusertest2_password=testing2 - local swiftusertest3_password=testing3 + # As these variables are used by create_userrc.sh, they must be exported + # The _password suffix is expected by create_userrc.sh + export swiftusertest1_password=testing + export swiftusertest2_password=testing2 + export swiftusertest3_password=testing3 KEYSTONE_CATALOG_BACKEND=${KEYSTONE_CATALOG_BACKEND:-sql} diff --git a/tools/create_userrc.sh b/tools/create_userrc.sh index 6a07be49f0..b43fd883a3 100755 --- a/tools/create_userrc.sh +++ b/tools/create_userrc.sh @@ -254,7 +254,8 @@ if [ $MODE != "create" ]; then # Checks for a specific password defined for an user. # Example for an username johndoe: JOHNDOE_PASSWORD=1234 - eval SPECIFIC_UPASSWORD="\$${USER_NAME^^}_PASSWORD" + # This mechanism is used by lib/swift + eval SPECIFIC_UPASSWORD="\$${user_name}_password" if [ -n "$SPECIFIC_UPASSWORD" ]; then USER_PASS=$SPECIFIC_UPASSWORD fi