Remove deprecated mysql attributes
Depends-On: https://review.opendev.org/716075 Change-Id: Ic6750ae4334315079dd51fccf54f595f278e79bc
This commit is contained in:
parent
abab7d0ecb
commit
849de5efdb
|
@ -42,7 +42,6 @@ The following cookbooks are dependencies:
|
|||
- 'etcd', '~> 5.6'
|
||||
- 'mariadb', '~> 3.1'
|
||||
- 'memcached', '~> 4.1'
|
||||
- 'mysql', '~> 8.2'
|
||||
- 'selinux'
|
||||
- 'yum-epel'
|
||||
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
#
|
||||
# Copyright:: 2012-2013, AT&T Services, Inc.
|
||||
# Copyright:: 2013-2014, SUSE Linux GmbH
|
||||
# Copyright:: 2020, Oregon State University
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -122,13 +123,11 @@ default['openstack']['db']['python_packages'] = {
|
|||
case node['platform_family']
|
||||
when 'rhel'
|
||||
default['openstack']['db']['service_type'] = 'mariadb'
|
||||
default['openstack']['db']['python_packages']['mysql'] = ['MySQL-python']
|
||||
default['openstack']['db']['python_packages']['mariadb'] = ['MySQL-python']
|
||||
default['openstack']['db']['python_packages']['percona-cluster'] = ['MySQL-python']
|
||||
default['openstack']['db']['python_packages']['galera'] = ['MySQL-python']
|
||||
when 'debian'
|
||||
default['openstack']['db']['service_type'] = 'mariadb'
|
||||
default['openstack']['db']['python_packages']['mysql'] = ['python3-mysqldb']
|
||||
default['openstack']['db']['python_packages']['mariadb'] = ['python3-mysqldb']
|
||||
default['openstack']['db']['python_packages']['percona-cluster'] = ['python3-mysqldb']
|
||||
default['openstack']['db']['python_packages']['galera'] = ['python3-mysqldb']
|
||||
|
|
|
@ -12,7 +12,6 @@ end
|
|||
depends 'etcd', '~> 5.6'
|
||||
depends 'mariadb', '~> 3.1'
|
||||
depends 'memcached', '~> 4.1'
|
||||
depends 'mysql', '~> 8.2'
|
||||
depends 'selinux'
|
||||
depends 'yum-epel'
|
||||
|
||||
|
|
Loading…
Reference in New Issue