From 302857e6171ecce133a68feb6ca70abb23d97394 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 18 Jun 2019 10:03:36 +0200 Subject: [PATCH] Install mariadb instead of mysql on deb distros MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Debian 'buster' does not ship MySQL - only MariaDB is provided. All supported platforms provide MariaDB. This patch replaces MySQL with MariaDB to fix Debian Buster. Debian Jessie is omitted on purpose - no need to touch unsupported releases. Change-Id: I9084f70dee2e1ee6eb1f4933ae0f9ef8809c1adc Signed-off-by: Radosław Piliszek Co-authored-by: Marcin Juszkiewicz Co-authored-by: Radosław Piliszek --- bindep.txt | 3 +-- .../defaults/required_defaults_Debian_family.yml | 2 +- .../defaults/required_defaults_Ubuntu_16.04.yml | 2 +- .../defaults/required_defaults_Ubuntu_18.04.yml | 2 +- .../defaults/required_defaults_Debian_family.yml | 2 +- .../defaults/required_defaults_Ubuntu_16.04.yml | 2 +- .../defaults/required_defaults_Ubuntu_18.04.yml | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/bindep.txt b/bindep.txt index 22fd97916..3b25e8a69 100644 --- a/bindep.txt +++ b/bindep.txt @@ -11,8 +11,7 @@ lsb-release [platform:suse platform:dpkg] redhat-lsb [platform:redhat] make mariadb [platform:suse] -mariadb-server [platform:redhat] -mysql-server [platform:dpkg] +mariadb-server [platform:redhat platform:dpkg] net-tools python [platform:rpm] python-minimal [platform:dpkg] diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml index 7f9f61403..7c998f610 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml @@ -9,7 +9,7 @@ nginx_user: www-data mysql_service_name: mysql tftp_service_name: tftpd-hpa required_packages: - - mysql-server + - mariadb-server - python-dev - python-mysqldb - python-configparser diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_16.04.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_16.04.yml index f99feb21f..4f6f509c5 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_16.04.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_16.04.yml @@ -3,7 +3,7 @@ init_template: systemd_template.j2 init_dest_dir: /lib/systemd/system/ init_ext: .service required_packages: - - mysql-server + - mariadb-server - python-dev - python-mysqldb - python-configparser diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_18.04.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_18.04.yml index f99feb21f..4f6f509c5 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_18.04.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_18.04.yml @@ -3,7 +3,7 @@ init_template: systemd_template.j2 init_dest_dir: /lib/systemd/system/ init_ext: .service required_packages: - - mysql-server + - mariadb-server - python-dev - python-mysqldb - python-configparser diff --git a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Debian_family.yml b/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Debian_family.yml index c2ee4d368..021cf4a00 100644 --- a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Debian_family.yml +++ b/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Debian_family.yml @@ -5,7 +5,7 @@ init_ext: .conf nginx_user: www-data mysql_service_name: mysql required_packages: - - mysql-server + - mariadb-server - python-dev - python-mysqldb - python-configparser diff --git a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_16.04.yml b/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_16.04.yml index c758fcb79..90104d087 100644 --- a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_16.04.yml +++ b/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_16.04.yml @@ -3,7 +3,7 @@ init_template: systemd_template.j2 init_dest_dir: /lib/systemd/system/ init_ext: .service required_packages: - - mysql-server + - mariadb-server - python-dev - python-mysqldb - python-configparser diff --git a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_18.04.yml b/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_18.04.yml index c758fcb79..90104d087 100644 --- a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_18.04.yml +++ b/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_18.04.yml @@ -3,7 +3,7 @@ init_template: systemd_template.j2 init_dest_dir: /lib/systemd/system/ init_ext: .service required_packages: - - mysql-server + - mariadb-server - python-dev - python-mysqldb - python-configparser