diff options
| -rw-r--r-- | trove/common/cfg.py | 3 | ||||
| -rw-r--r-- | trove/guestagent/datastore/mysql_common/service.py | 6 | ||||
| -rw-r--r-- | zuul.d/projects.yaml | 3 |
3 files changed, 6 insertions, 6 deletions
diff --git a/trove/common/cfg.py b/trove/common/cfg.py index 54dc4961..527c4866 100644 --- a/trove/common/cfg.py +++ b/trove/common/cfg.py @@ -1536,7 +1536,8 @@ guest_agent_opts = [ ), cfg.StrOpt( 'container_registry_password', - help='The plaintext registry password.' + help='The plaintext registry password.', + secret=True, ), ] diff --git a/trove/guestagent/datastore/mysql_common/service.py b/trove/guestagent/datastore/mysql_common/service.py index ca1e530e..e9bd50c6 100644 --- a/trove/guestagent/datastore/mysql_common/service.py +++ b/trove/guestagent/datastore/mysql_common/service.py @@ -589,7 +589,8 @@ class BaseMySqlApp(service.BaseDbApp): user = "%s:%s" % (CONF.database_service_uid, CONF.database_service_uid) # Create folders for mysql on localhost - for folder in ['/etc/mysql', '/var/run/mysqld']: + for folder in ['/etc/mysql', '/var/run/mysqld', + '/etc/mysql/mysql.conf.d']: operating_system.ensure_directory( folder, user=CONF.database_service_uid, group=CONF.database_service_uid, force=True, @@ -663,7 +664,8 @@ class BaseMySqlApp(service.BaseDbApp): LOG.info("Restarting mysql") # Ensure folders permission for database. - for folder in ['/etc/mysql', '/var/run/mysqld']: + for folder in ['/etc/mysql', '/var/run/mysqld', + '/etc/mysql/mysql.conf.d']: operating_system.ensure_directory( folder, user=CONF.database_service_uid, group=CONF.database_service_uid, force=True, diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 4f6af368..1af775b1 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -4,7 +4,6 @@ templates: - check-requirements - openstack-cover-jobs - # - openstack-lower-constraints-jobs - openstack-python3-jobs - openstack-python3-jobs-arm64 - periodic-stable-jobs @@ -26,8 +25,6 @@ voting: false - trove-tempest-ipv6-only: voting: false - - trove-functional-mysql: - voting: false gate: jobs: - trove-tempest: |