diff options
4 files changed, 12 insertions, 23 deletions
diff --git a/docker/centos/binary/swift/swift-account/start.sh b/docker/centos/binary/swift/swift-account/start.sh index f634f6e54..bf86830f9 100644 --- a/docker/centos/binary/swift/swift-account/start.sh +++ b/docker/centos/binary/swift/swift-account/start.sh @@ -12,17 +12,16 @@ fail_unless_db fail_unless_os_service_running keystone if ! [ "$SWIFT_DB_PASSWORD" ]; then - SWIFT_DB_PASSWORD=$(openssl rand -hex 15) - export SWIFT_DB_PASSWORD + SWIFT_DB_PASSWORD=$(openssl rand -hex 15) + export SWIFT_DB_PASSWORD fi sh /opt/swift/config-swift.sh account-server -mysql -h ${MARIADB_SERVICE_HOST} -u root \ - -p${DB_ROOT_PASSWORD} mysql <<EOF +mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF CREATE DATABASE IF NOT EXISTS ${SWIFT_DB_NAME}; GRANT ALL PRIVILEGES ON swift* TO - '${SWIFT_DB_USER}'@'%' IDENTIFIED BY '${SWIFT_DB_PASSWORD}' +'${SWIFT_DB_USER}'@'%' IDENTIFIED BY '${SWIFT_DB_PASSWORD}' EOF export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" diff --git a/docker/centos/binary/swift/swift-base/24q124 b/docker/centos/binary/swift/swift-base/24q124 deleted file mode 100644 index 99e00593e..000000000 --- a/docker/centos/binary/swift/swift-base/24q124 +++ /dev/null @@ -1,8 +0,0 @@ -FROM fedora-rdo-base -MAINTAINER Steven Dake <sdake@redhat.com> - -RUN yum -y install openstack-utils openstack-swift && yum clean all - -# These will come after we sort out start time config -RUN mkdir /opt/swift -#COPY config-swift.sh /opt/swift/config-swift.sh diff --git a/docker/centos/binary/swift/swift-container/start.sh b/docker/centos/binary/swift/swift-container/start.sh index 6e303872b..42d4ccf35 100644 --- a/docker/centos/binary/swift/swift-container/start.sh +++ b/docker/centos/binary/swift/swift-container/start.sh @@ -12,17 +12,16 @@ fail_unless_db fail_unless_os_service_running keystone if ! [ "$SWIFT_DB_PASSWORD" ]; then - SWIFT_DB_PASSWORD=$(openssl rand -hex 15) - export SWIFT_DB_PASSWORD + SWIFT_DB_PASSWORD=$(openssl rand -hex 15) + export SWIFT_DB_PASSWORD fi sh /opt/swift/config-swift.sh container -mysql -h ${MARIADB_SERVICE_HOST} -u root \ - -p${DB_ROOT_PASSWORD} mysql <<EOF +mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF CREATE DATABASE IF NOT EXISTS ${SWIFT_DB_NAME}; GRANT ALL PRIVILEGES ON swift* TO - '${SWIFT_DB_USER}'@'%' IDENTIFIED BY '${SWIFT_DB_PASSWORD}' +'${SWIFT_DB_USER}'@'%' IDENTIFIED BY '${SWIFT_DB_PASSWORD}' EOF export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" diff --git a/docker/centos/binary/swift/swift-object/start.sh b/docker/centos/binary/swift/swift-object/start.sh index 8626e7678..7ed97536e 100644 --- a/docker/centos/binary/swift/swift-object/start.sh +++ b/docker/centos/binary/swift/swift-object/start.sh @@ -12,17 +12,16 @@ fail_unless_db fail_unless_os_service_running keystone if ! [ "$SWIFT_DB_PASSWORD" ]; then - SWIFT_DB_PASSWORD=$(openssl rand -hex 15) - export SWIFT_DB_PASSWORD + SWIFT_DB_PASSWORD=$(openssl rand -hex 15) + export SWIFT_DB_PASSWORD fi sh /opt/swift/config-swift.sh engine -mysql -h ${MARIADB_SERVICE_HOST} -u root \ - -p${DB_ROOT_PASSWORD} mysql <<EOF +mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF CREATE DATABASE IF NOT EXISTS ${SWIFT_DB_NAME}; GRANT ALL PRIVILEGES ON swift* TO - '${SWIFT_DB_USER}'@'%' IDENTIFIED BY '${SWIFT_DB_PASSWORD}' +'${SWIFT_DB_USER}'@'%' IDENTIFIED BY '${SWIFT_DB_PASSWORD}' EOF export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" |