From 3c080f9e62ffc6c75c64ba0d86167fbeb2d83a35 Mon Sep 17 00:00:00 2001 From: Lars Kellogg-Stedman Date: Mon, 6 Oct 2014 20:54:44 -0400 Subject: renamed keystone services This renames the keystone services so that they are named by function, rather than port number (which would be confusing if they were running on a different port). Change-Id: Ibb0263a133c28a104563df431870a9effe584012 --- docker/swift/swift-account/start.sh | 2 +- docker/swift/swift-container/start.sh | 2 +- docker/swift/swift-object/start.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docker/swift') diff --git a/docker/swift/swift-account/start.sh b/docker/swift/swift-account/start.sh index 29269d577..562fd4ca4 100644 --- a/docker/swift/swift-account/start.sh +++ b/docker/swift/swift-account/start.sh @@ -31,7 +31,7 @@ GRANT ALL PRIVILEGES ON swift* TO EOF export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" -export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONEMASTER_35357_PORT_35357_TCP_ADDR}:35357/v2.0" +export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_PORT_35357_TCP_ADDR}:35357/v2.0" /bin/keystone user-create --name ${SWIFT_KEYSTONE_USER} --pass ${SWIFT_ADMIN_PASSWORD} /bin/keystone role-create --name ${SWIFT_KEYSTONE_USER} diff --git a/docker/swift/swift-container/start.sh b/docker/swift/swift-container/start.sh index aa22739b7..e96471fb7 100644 --- a/docker/swift/swift-container/start.sh +++ b/docker/swift/swift-container/start.sh @@ -31,7 +31,7 @@ GRANT ALL PRIVILEGES ON swift* TO EOF export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" -export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONEMASTER_35357_PORT_35357_TCP_ADDR}:35357/v2.0" +export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_PORT_35357_TCP_ADDR}:35357/v2.0" /bin/keystone user-create --name ${SWIFT_KEYSTONE_USER} --pass ${SWIFT_ADMIN_PASSWORD} /bin/keystone role-create --name ${SWIFT_KEYSTONE_USER} diff --git a/docker/swift/swift-object/start.sh b/docker/swift/swift-object/start.sh index 4f0a8febf..1546d8271 100644 --- a/docker/swift/swift-object/start.sh +++ b/docker/swift/swift-object/start.sh @@ -31,7 +31,7 @@ GRANT ALL PRIVILEGES ON swift* TO EOF export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" -export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONEMASTER_35357_PORT_35357_TCP_ADDR}:35357/v2.0" +export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_PORT_35357_TCP_ADDR}:35357/v2.0" /bin/keystone user-create --name ${SWIFT_KEYSTONE_USER} --pass ${SWIFT_ADMIN_PASSWORD} /bin/keystone role-create --name ${SWIFT_KEYSTONE_USER} -- cgit v1.2.3