summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-19 16:56:17 +0000
committerGerrit Code Review <review@openstack.org>2017-06-19 16:56:17 +0000
commit655f7186079c6cdfe2245a57e44faa12d423c4e1 (patch)
tree6413b260b84ec76eed9e5b85d9f2c3c8c093b212
parent8d1cfb5d07db2de187514ded3c82a875a9b326d4 (diff)
parentcecc30af5d039890677e82ba93ae692c7f9f50f2 (diff)
Merge "Fix database configuration for remote MariaDB setups"
-rw-r--r--packstack/plugins/mariadb_003.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/packstack/plugins/mariadb_003.py b/packstack/plugins/mariadb_003.py
index 066d658..24e4460 100644
--- a/packstack/plugins/mariadb_003.py
+++ b/packstack/plugins/mariadb_003.py
@@ -96,9 +96,9 @@ def initSequences(controller):
96 96
97def create_manifest(config, messages): 97def create_manifest(config, messages):
98 if config['CONFIG_MARIADB_INSTALL'] == 'y': 98 if config['CONFIG_MARIADB_INSTALL'] == 'y':
99 host = config['CONFIG_MARIADB_HOST']
100 else:
101 host = config['CONFIG_CONTROLLER_HOST'] 99 host = config['CONFIG_CONTROLLER_HOST']
100 else:
101 host = config['CONFIG_MARIADB_HOST']
102 102
103 if config['CONFIG_IP_VERSION'] == 'ipv6': 103 if config['CONFIG_IP_VERSION'] == 'ipv6':
104 config['CONFIG_MARIADB_HOST_URL'] = "[%s]" % host 104 config['CONFIG_MARIADB_HOST_URL'] = "[%s]" % host