From 06598e274e436ccceacb244d0ea6319025326f18 Mon Sep 17 00:00:00 2001 From: Gael Chamoulaud Date: Wed, 21 Jan 2015 09:36:17 +0100 Subject: [PATCH] Standardize DB Product Name Change-Id: I05b6e4ec3d206db6e88a5ee5cbe4b08bc9255e05 Signed-off-by: Gael Chamoulaud (cherry picked from commit c8de4c0c1c714d1467636464f2aacc727847e74c) --- packstack/modules/common.py | 8 ++++---- packstack/plugins/heat_650.py | 4 ++-- packstack/plugins/ironic_275.py | 2 +- .../lib/puppet/provider/remote_database/mysql.rb | 2 +- .../remote/lib/puppet/type/remote_database_user.rb | 2 +- tests/installer/test_setup_params.py | 10 +++++----- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packstack/modules/common.py b/packstack/modules/common.py index 948a83c26..539be2912 100644 --- a/packstack/modules/common.py +++ b/packstack/modules/common.py @@ -16,8 +16,8 @@ def filtered_hosts(config, exclude=True, dbhost=True): dbinst = config.get('CONFIG_MARIADB_INSTALL') == 'y' vcenter = config.get('CONFIG_VMWARE_BACKEND') == 'y' for hosttype, hostname in utils.host_iter(config): - # if dbhost is being taken into account and we are not installing MySQL - # then we should omit the MySQL host + # if dbhost is being taken into account and we are not installing + # MariaDB then we should omit the MariaDB host if dbhost and not dbinst and hosttype == 'CONFIG_MARIADB_HOST': continue if vcenter and hosttype == 'CONFIG_VCENTER_HOST': @@ -34,6 +34,6 @@ def is_all_in_one(config): returns False. """ # Even if some host have been excluded from installation, we must count - # with them when checking all-in-one. MySQL host should however be omitted - # if we are not installing MySQL + # with them when checking all-in-one. MariaDB host should however be + # omitted if we are not installing MariaDB. return len(filtered_hosts(config, exclude=False, dbhost=True)) == 1 diff --git a/packstack/plugins/heat_650.py b/packstack/plugins/heat_650.py index 3bc3293e9..26182dc21 100644 --- a/packstack/plugins/heat_650.py +++ b/packstack/plugins/heat_650.py @@ -26,8 +26,8 @@ def initConfig(controller): parameters = [ {"CMD_OPTION": "os-heat-mysql-password", "USAGE": ('The password used by Heat user to authenticate against ' - 'MySQL'), - "PROMPT": "Enter the password for the Heat MySQL user", + 'DB'), + "PROMPT": "Enter the password for the Heat DB user", "OPTION_LIST": [], "VALIDATORS": [validators.validate_not_empty], "DEFAULT_VALUE": "PW_PLACEHOLDER", diff --git a/packstack/plugins/ironic_275.py b/packstack/plugins/ironic_275.py index d35c84a8f..c67aab442 100644 --- a/packstack/plugins/ironic_275.py +++ b/packstack/plugins/ironic_275.py @@ -21,7 +21,7 @@ def initConfig(controller): ironic_params = [ {"CONF_NAME": "CONFIG_IRONIC_DB_PW", "CMD_OPTION": "os-ironic-db-passwd", - "PROMPT": "Enter the password for the Ironic MySQL user", + "PROMPT": "Enter the password for the Ironic DB user", "USAGE": "The password to use for the Ironic DB access", "OPTION_LIST": [], "VALIDATORS": [validators.validate_not_empty], diff --git a/packstack/puppet/modules/remote/lib/puppet/provider/remote_database/mysql.rb b/packstack/puppet/modules/remote/lib/puppet/provider/remote_database/mysql.rb index fe14d723c..a430acb7a 100644 --- a/packstack/puppet/modules/remote/lib/puppet/provider/remote_database/mysql.rb +++ b/packstack/puppet/modules/remote/lib/puppet/provider/remote_database/mysql.rb @@ -1,6 +1,6 @@ Puppet::Type.type(:remote_database).provide(:mysql) do - desc "Manages remote MySQL database." + desc "Manages remote MariaDB database." defaultfor :kernel => 'Linux' diff --git a/packstack/puppet/modules/remote/lib/puppet/type/remote_database_user.rb b/packstack/puppet/modules/remote/lib/puppet/type/remote_database_user.rb index 0db0ef024..938cca048 100644 --- a/packstack/puppet/modules/remote/lib/puppet/type/remote_database_user.rb +++ b/packstack/puppet/modules/remote/lib/puppet/type/remote_database_user.rb @@ -12,7 +12,7 @@ Puppet::Type.newtype(:remote_database_user) do raise(ArgumentError, "Invalid database user #{value}") unless value =~ /[\w-]*@[\w%\.:]+/ username = value.split('@')[0] if username.size > 16 - raise ArgumentError, "MySQL usernames are limited to a maximum of 16 characters" + raise ArgumentError, "MariaDB usernames are limited to a maximum of 16 characters" end end end diff --git a/tests/installer/test_setup_params.py b/tests/installer/test_setup_params.py index 2e2ea4061..5dd943d10 100644 --- a/tests/installer/test_setup_params.py +++ b/tests/installer/test_setup_params.py @@ -29,10 +29,10 @@ class ParameterTestCase(PackstackTestCaseMixin, TestCase): def setUp(self): super(ParameterTestCase, self).setUp() self.data = { - "CMD_OPTION": "mysql-host", + "CMD_OPTION": "mariadb-host", "USAGE": ("The IP address of the server on which to " - "install MySQL"), - "PROMPT": "Enter the IP address of the MySQL server", + "install MariaDB"), + "PROMPT": "Enter the IP address of the MariaDB server", "OPTION_LIST": [], "VALIDATORS": [], "DEFAULT_VALUE": "127.0.0.1", @@ -64,8 +64,8 @@ class GroupTestCase(PackstackTestCaseMixin, TestCase): def setUp(self): super(GroupTestCase, self).setUp() self.attrs = { - "GROUP_NAME": "MYSQL", - "DESCRIPTION": "MySQL Config parameters", + "GROUP_NAME": "MARIADB", + "DESCRIPTION": "MariaDB Config parameters", "PRE_CONDITION": "y", "PRE_CONDITION_MATCH": "y", "POST_CONDITION": False,