summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-04-17 20:15:54 +0000
committerGerrit Code Review <review@openstack.org>2018-04-17 20:15:54 +0000
commitc3b1546b95792a54f1e05feb4a94cac3415c1786 (patch)
tree3851579ae9f8b12d32809e9bffbd734d39678228
parentc99b9a3e08a898f12ac88042080fd9766ab71c22 (diff)
parentd45716a9fe1662f250b000864f03452e25a7ac76 (diff)
Merge "Fix mysql instance create failed when enable skip-name-resolve" into stable/pikestable/pike
-rw-r--r--trove/guestagent/datastore/mysql_common/service.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/trove/guestagent/datastore/mysql_common/service.py b/trove/guestagent/datastore/mysql_common/service.py
index 49c3d4a..5f06fab 100644
--- a/trove/guestagent/datastore/mysql_common/service.py
+++ b/trove/guestagent/datastore/mysql_common/service.py
@@ -657,9 +657,9 @@ class BaseMySqlApp(object):
657 with all privileges similar to the root user. 657 with all privileges similar to the root user.
658 """ 658 """
659 LOG.debug("Creating Trove admin user '%s'.", ADMIN_USER_NAME) 659 LOG.debug("Creating Trove admin user '%s'.", ADMIN_USER_NAME)
660 localhost = "localhost" 660 host = "127.0.0.1"
661 g = sql_query.Grant(permissions='ALL', user=ADMIN_USER_NAME, 661 g = sql_query.Grant(permissions='ALL', user=ADMIN_USER_NAME,
662 host=localhost, grant_option=True, clear=password) 662 host=host, grant_option=True, clear=password)
663 t = text(str(g)) 663 t = text(str(g))
664 client.execute(t) 664 client.execute(t)
665 LOG.debug("Trove admin user '%s' created.", ADMIN_USER_NAME) 665 LOG.debug("Trove admin user '%s' created.", ADMIN_USER_NAME)