Browse code
change `swift post` to openstackclient cli command
with the release of osc 1.8.0, modifying object store account
properties is now available. use this mechanism and avoid setting
environment variable that are only helpful for swift CLI.
Change-Id: Ie51e3e2bb86162763f23d0a6bed36208811f89fc
Steve Martinelli authored on 2015/10/21 12:15:38Showing 1 changed files
| ... | ... |
@@ -813,11 +813,13 @@ function stop_swift {
|
| 813 | 813 |
} |
| 814 | 814 |
|
| 815 | 815 |
function swift_configure_tempurls {
|
| 816 |
+ # note we are using swift credentials! |
|
| 816 | 817 |
OS_USERNAME=swift \ |
| 817 |
- OS_PROJECT_NAME=$SERVICE_TENANT_NAME \ |
|
| 818 |
- OS_PASSWORD=$SERVICE_PASSWORD \ |
|
| 819 |
- OS_AUTH_URL=$SERVICE_ENDPOINT \ |
|
| 820 |
- swift post --auth-version 3 -m "Temp-URL-Key: $SWIFT_TEMPURL_KEY" |
|
| 818 |
+ OS_PASSWORD=$SERVICE_PASSWORD \ |
|
| 819 |
+ OS_PROJECT_NAME=$SERVICE_TENANT_NAME \ |
|
| 820 |
+ OS_AUTH_URL=$SERVICE_ENDPOINT \ |
|
| 821 |
+ openstack object store account \ |
|
| 822 |
+ set --property "Temp-URL-Key=$SWIFT_TEMPURL_KEY" |
|
| 821 | 823 |
} |
| 822 | 824 |
|
| 823 | 825 |
# Restore xtrace |