diff options
| author | Lars Kellogg-Stedman <lars@redhat.com> | 2014-10-05 16:12:44 -0400 |
|---|---|---|
| committer | Lars Kellogg-Stedman <lars@redhat.com> | 2014-10-07 10:58:52 -0400 |
| commit | 068face6fa52d19d421913b9969b291500a39c6d (patch) | |
| tree | 4eb637bcdc592bc66ff13c47745184aafb100f25 /docker/swift | |
| parent | 296b09e0c444cc91f3e9f4a1046989d956c1253a (diff) | |
| download | kolla-068face6fa52d19d421913b9969b291500a39c6d.tar.gz kolla-068face6fa52d19d421913b9969b291500a39c6d.zip | |
use renamed mariadb services
This patch updates all the json files that reference the mariadb service
variables to ues the new names.
Labelling things foo-master crept into this repository from the
kubernetes guestbook example (which has redis-master and redis-slaves).
We're not running clustered software at the moment so these labels are
unnecessary.
Change-Id: I229d04c89aa13cb6cc2e1c33a0a7b21e1c6e9caa
Diffstat (limited to 'docker/swift')
| -rw-r--r-- | docker/swift/swift-account/start.sh | 2 | ||||
| -rw-r--r-- | docker/swift/swift-container/start.sh | 2 | ||||
| -rw-r--r-- | docker/swift/swift-object/start.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/swift/swift-account/start.sh b/docker/swift/swift-account/start.sh index 783df0a66..29269d577 100644 --- a/docker/swift/swift-account/start.sh +++ b/docker/swift/swift-account/start.sh @@ -23,7 +23,7 @@ fi sh /opt/swift/config-swift.sh account-server -mysql -h ${MARIADBMASTER_PORT_3306_TCP_ADDR} -u root \ +mysql -h ${MARIADB_PORT_3306_TCP_ADDR} -u root \ -p${DB_ROOT_PASSWORD} mysql <<EOF CREATE DATABASE IF NOT EXISTS ${SWIFT_DB_NAME}; GRANT ALL PRIVILEGES ON swift* TO diff --git a/docker/swift/swift-container/start.sh b/docker/swift/swift-container/start.sh index 8e952c729..aa22739b7 100644 --- a/docker/swift/swift-container/start.sh +++ b/docker/swift/swift-container/start.sh @@ -23,7 +23,7 @@ fi sh /opt/swift/config-swift.sh container -mysql -h ${MARIADBMASTER_PORT_3306_TCP_ADDR} -u root \ +mysql -h ${MARIADB_PORT_3306_TCP_ADDR} -u root \ -p${DB_ROOT_PASSWORD} mysql <<EOF CREATE DATABASE IF NOT EXISTS ${SWIFT_DB_NAME}; GRANT ALL PRIVILEGES ON swift* TO diff --git a/docker/swift/swift-object/start.sh b/docker/swift/swift-object/start.sh index 4b294d508..4f0a8febf 100644 --- a/docker/swift/swift-object/start.sh +++ b/docker/swift/swift-object/start.sh @@ -23,7 +23,7 @@ fi sh /opt/swift/config-swift.sh engine -mysql -h ${MARIADBMASTER_PORT_3306_TCP_ADDR} -u root \ +mysql -h ${MARIADB_PORT_3306_TCP_ADDR} -u root \ -p${DB_ROOT_PASSWORD} mysql <<EOF CREATE DATABASE IF NOT EXISTS ${SWIFT_DB_NAME}; GRANT ALL PRIVILEGES ON swift* TO |