x/packstack
Code Issues Proposed changes

Standardize DB Product Name

Browse Source 
Change-Id: I05b6e4ec3d206db6e88a5ee5cbe4b08bc9255e05
Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
This commit is contained in:
Gael Chamoulaud 2015-01-21 09:36:17 +01:00
parent 3ebcee4b2e
commit c8de4c0c1c
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packstack/modules/common.py
View File

@ -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

4
packstack/plugins/heat_650.py
View File

@ -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",

2
packstack/plugins/ironic_275.py
View File

@ -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],

2
packstack/puppet/modules/remote/lib/puppet/provider/remote_database/mysql.rb
View File

@ -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'

2
packstack/puppet/modules/remote/lib/puppet/type/remote_database_user.rb
View File

@ -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

10
tests/installer/test_setup_params.py
View File

@ -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,