diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-31 17:52:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-31 17:52:43 +0000 |
| commit | a20fbed2520db9b1ab0bde80acf9b59466ec56f6 (patch) | |
| tree | 8c1ecd5c4ef88b30dfb008c35b67e85512f444d0 /docker/common/swift/swift-proxy-server | |
| parent | 2887c6d2e4d511888d9156668e2b75b48d58add8 (diff) | |
| parent | 5e28eb8496c356f2074c21d72b52906451696e12 (diff) | |
| download | kolla-a20fbed2520db9b1ab0bde80acf9b59466ec56f6.tar.gz kolla-a20fbed2520db9b1ab0bde80acf9b59466ec56f6.zip | |
Merge "Implement Swift Containers"
Diffstat (limited to 'docker/common/swift/swift-proxy-server')
| -rwxr-xr-x | docker/common/swift/swift-proxy-server/config-external.sh | 2 | ||||
| -rwxr-xr-x | docker/common/swift/swift-proxy-server/config-internal.sh | 148 | ||||
| -rwxr-xr-x | docker/common/swift/swift-proxy-server/start.sh | 3 |
3 files changed, 149 insertions, 4 deletions
diff --git a/docker/common/swift/swift-proxy-server/config-external.sh b/docker/common/swift/swift-proxy-server/config-external.sh index 813462735..2b3327b33 100755 --- a/docker/common/swift/swift-proxy-server/config-external.sh +++ b/docker/common/swift/swift-proxy-server/config-external.sh @@ -6,5 +6,5 @@ OWNER="swift" if [[ -f "$SOURCE" ]]; then cp $SOURCE $TARGET chown ${OWNER}: $TARGET - chmod 0644 $TARGET + chmod 0640 $TARGET fi diff --git a/docker/common/swift/swift-proxy-server/config-internal.sh b/docker/common/swift/swift-proxy-server/config-internal.sh index 3f387d187..436d1fbba 100755 --- a/docker/common/swift/swift-proxy-server/config-internal.sh +++ b/docker/common/swift/swift-proxy-server/config-internal.sh @@ -1,5 +1,149 @@ #!/bin/bash -sh /opt/swift/config-swift.sh proxy +set -e -exec /usr/bin/swift-proxy-server +CMD="/usr/bin/swift-proxy-server" +ARGS="/etc/swift/proxy-server.conf --verbose" + +. /opt/kolla/config-swift.sh + +check_required_vars \ + SWIFT_ACCOUNT_SVC_RING_DEVICES \ + SWIFT_ACCOUNT_SVC_RING_HOSTS \ + SWIFT_ACCOUNT_SVC_RING_MIN_PART_HOURS \ + SWIFT_ACCOUNT_SVC_RING_NAME \ + SWIFT_ACCOUNT_SVC_RING_PART_POWER \ + SWIFT_ACCOUNT_SVC_RING_REPLICAS \ + SWIFT_ACCOUNT_SVC_RING_WEIGHTS \ + SWIFT_ACCOUNT_SVC_RING_ZONES \ + SWIFT_ADMIN_USER \ + SWIFT_CONTAINER_SVC_RING_DEVICES \ + SWIFT_CONTAINER_SVC_RING_HOSTS \ + SWIFT_CONTAINER_SVC_RING_MIN_PART_HOURS \ + SWIFT_CONTAINER_SVC_RING_NAME \ + SWIFT_CONTAINER_SVC_RING_PART_POWER \ + SWIFT_CONTAINER_SVC_RING_REPLICAS \ + SWIFT_CONTAINER_SVC_RING_WEIGHTS \ + SWIFT_CONTAINER_SVC_RING_ZONES \ + SWIFT_KEYSTONE_PASSWORD \ + SWIFT_KEYSTONE_USER \ + SWIFT_OBJECT_SVC_RING_DEVICES \ + SWIFT_OBJECT_SVC_RING_HOSTS \ + SWIFT_OBJECT_SVC_RING_MIN_PART_HOURS \ + SWIFT_OBJECT_SVC_RING_NAME \ + SWIFT_OBJECT_SVC_RING_PART_POWER \ + SWIFT_OBJECT_SVC_RING_REPLICAS \ + SWIFT_OBJECT_SVC_RING_WEIGHTS \ + SWIFT_OBJECT_SVC_RING_ZONES \ + SWIFT_PROXY_ACCOUNT_AUTOCREATE \ + SWIFT_PROXY_AUTH_PLUGIN \ + SWIFT_PROXY_BIND_IP \ + SWIFT_PROXY_BIND_PORT \ + SWIFT_PROXY_DELAY_AUTH_DECISION \ + SWIFT_PROXY_DIR \ + SWIFT_PROXY_OPERATOR_ROLES \ + SWIFT_PROXY_PASSWORD \ + SWIFT_PROXY_PIPELINE_MAIN \ + SWIFT_PROXY_PROJECT_DOMAIN_ID \ + SWIFT_PROXY_PROJECT_NAME \ + SWIFT_PROXY_SIGNING_DIR \ + SWIFT_PROXY_USER_DOMAIN_ID \ + SWIFT_PROXY_USERNAME \ + SWIFT_USER + +export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" +export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v2.0" + +crux user-create --update \ + -n "${SWIFT_KEYSTONE_USER}" \ + -p "${SWIFT_KEYSTONE_PASSWORD}" \ + -t "${ADMIN_TENANT_NAME}" \ + -r admin + +crux endpoint-create --remove-all \ + -n swift -t object-store \ + -I "http://${SWIFT_API_SERVICE_HOST}:8080/v1/AUTH_%(tenant_id)s'" \ + -P "http://${PUBLIC_IP}:8080/v1/AUTH_%(tenant_id)s" \ + -A "http://${SWIFT_API_SERVICE_HOST}:8080'" + +cfg=/etc/swift/proxy-server.conf + +crudini --set $cfg DEFAULT bind_port "${SWIFT_PROXY_BIND_PORT}" +crudini --set $cfg DEFAULT user "${SWIFT_USER}" +crudini --set $cfg DEFAULT swift_dir "${SWIFT_PROXY_DIR}" +crudini --set $cfg DEFAULT bind_ip "${SWIFT_PROXY_BIND_IP}" + +crudini --set $cfg pipeline:main pipeline "${SWIFT_PROXY_PIPELINE_MAIN}" + +crudini --set $cfg app:proxy-server account_autocreate "${SWIFT_PROXY_ACCOUNT_AUTOCREATE}" + +crudini --del $cfg filter:keystone +crudini --set $cfg filter:keystoneauth use egg:swift#keystoneauth +crudini --set $cfg filter:keystoneauth operator_roles "${SWIFT_PROXY_OPERATOR_ROLES}" + +crudini --set $cfg filter:container_sync use egg:swift#container_sync + +crudini --set $cfg filter:bulk use egg:swift#bulk + +crudini --set $cfg filter:ratelimit use egg:swift#ratelimit + +crudini --set $cfg filter:authtoken auth_uri \ + "http://${KEYSTONE_PUBLIC_SERVICE_HOST}:${KEYSTONE_PUBLIC_SERVICE_PORT}/" +crudini --set $cfg filter:authtoken auth_url \ + "http://${KEYSTONE_PUBLIC_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/" +crudini --set $cfg filter:authtoken auth_host "${KEYSTONE_PUBLIC_SERVICE_HOST}" +crudini --set $cfg filter:authtoken auth_port "${KEYSTONE_ADMIN_SERVICE_PORT}" +crudini --set $cfg filter:authtoken admin_tenant_name "${ADMIN_TENANT_NAME}" +crudini --set $cfg filter:authtoken admin_user "${SWIFT_KEYSTONE_USER}" +crudini --set $cfg filter:authtoken admin_password "${SWIFT_KEYSTONE_PASSWORD}" +crudini --set $cfg filter:authtoken delay_auth_decision "${SWIFT_PROXY_DELAY_AUTH_DECISION}" +crudini --set $cfg filter:authtoken signing_dir "${SWIFT_PROXY_SIGNING_DIR}" + +crudini --set $cfg filter:cache memcache_servers "${PUBLIC_IP}:11211" + +crudini --set $cfg filter:gatekeeper use egg:swift#gatekeeper + +crudini --set $cfg filter:slo use egg:swift#slo + +crudini --set $cfg filter:dlo use egg:swift#dlo + +# Create swift user and group if they don't exist +id -u swift &>/dev/null || useradd --user-group swift + +# TODO(pbourke): should these go into the Dockerfile instead? +# TODO(pbourke): do we need a data vol for these? +mkdir -p ${SWIFT_PROXY_SIGNING_DIR} +chown swift: ${SWIFT_PROXY_SIGNING_DIR} +chmod 0700 ${SWIFT_PROXY_SIGNING_DIR} + +python /opt/kolla/build-swift-ring.py \ + -f ${SWIFT_OBJECT_SVC_RING_NAME} \ + -p ${SWIFT_OBJECT_SVC_RING_PART_POWER} \ + -r ${SWIFT_OBJECT_SVC_RING_REPLICAS} \ + -m ${SWIFT_OBJECT_SVC_RING_MIN_PART_HOURS} \ + -H ${SWIFT_OBJECT_SVC_RING_HOSTS} \ + -w ${SWIFT_OBJECT_SVC_RING_WEIGHTS} \ + -d ${SWIFT_OBJECT_SVC_RING_DEVICES} \ + -z ${SWIFT_OBJECT_SVC_RING_ZONES} + +python /opt/kolla/build-swift-ring.py \ + -f ${SWIFT_ACCOUNT_SVC_RING_NAME} \ + -p ${SWIFT_ACCOUNT_SVC_RING_PART_POWER} \ + -r ${SWIFT_ACCOUNT_SVC_RING_REPLICAS} \ + -m ${SWIFT_ACCOUNT_SVC_RING_MIN_PART_HOURS} \ + -H ${SWIFT_ACCOUNT_SVC_RING_HOSTS} \ + -w ${SWIFT_ACCOUNT_SVC_RING_WEIGHTS} \ + -d ${SWIFT_ACCOUNT_SVC_RING_DEVICES} \ + -z ${SWIFT_ACCOUNT_SVC_RING_ZONES} + +python /opt/kolla/build-swift-ring.py \ + -f ${SWIFT_CONTAINER_SVC_RING_NAME} \ + -p ${SWIFT_CONTAINER_SVC_RING_PART_POWER} \ + -r ${SWIFT_CONTAINER_SVC_RING_REPLICAS} \ + -m ${SWIFT_CONTAINER_SVC_RING_MIN_PART_HOURS} \ + -H ${SWIFT_CONTAINER_SVC_RING_HOSTS} \ + -w ${SWIFT_CONTAINER_SVC_RING_WEIGHTS} \ + -d ${SWIFT_CONTAINER_SVC_RING_DEVICES} \ + -z ${SWIFT_CONTAINER_SVC_RING_ZONES} + +exec $CMD $ARGS diff --git a/docker/common/swift/swift-proxy-server/start.sh b/docker/common/swift/swift-proxy-server/start.sh index 8957b5052..c1b5b29cd 100755 --- a/docker/common/swift/swift-proxy-server/start.sh +++ b/docker/common/swift/swift-proxy-server/start.sh @@ -1,8 +1,9 @@ #!/bin/bash + set -o errexit CMD="/usr/bin/swift-proxy-server" -ARGS="" +ARGS="/etc/swift/proxy-server.conf --verbose" # Loading common functions. source /opt/kolla/kolla-common.sh |
