From 035d14ff98890613430ad8aa64cc30d22e4c31fe Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Sun, 7 Jun 2015 17:09:55 -0700
Subject: [PATCH] Make swift bashate compliant

The containers don't work, but alteast they will pass the gate ;)

Change-Id: Ic921f982122889d354cfee47772421d147d9ec57
Partially-implements: blueprint bashate-gate
---
 docker/centos/binary/swift/swift-account/start.sh   | 9 ++++-----
 docker/centos/binary/swift/swift-base/24q124        | 8 --------
 docker/centos/binary/swift/swift-container/start.sh | 9 ++++-----
 docker/centos/binary/swift/swift-object/start.sh    | 9 ++++-----
 4 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 docker/centos/binary/swift/swift-base/24q124

diff --git a/docker/centos/binary/swift/swift-account/start.sh b/docker/centos/binary/swift/swift-account/start.sh
index f634f6e54e..bf86830f98 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 99e00593ee..0000000000
--- 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 6e303872bf..42d4ccf355 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 8626e76785..7ed97536e7 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}"