From 138bbe629517fda4446b67c26df79e5801c05791 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Thu, 21 Jun 2018 10:44:00 +0100 Subject: [PATCH] Ensure that mysql_config is present mysql_config is required for subsequent pip installs of MySQL-python. Change-Id: I350cbbc283cdc0c9d1c6df144c4bb420fa45d86c --- vars/redhat-7.yml | 2 ++ vars/suse-42.yml | 2 ++ vars/ubuntu-16.04.yml | 2 ++ vars/ubuntu-18.04.yml | 2 ++ 4 files changed, 8 insertions(+) diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index 9949f3d..f0e0a36 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -25,8 +25,10 @@ _galera_client_repo: baseurl: "{{ galera_client_repo_url }}" gpgkey: "http://yum.mariadb.org/RPM-GPG-KEY-MariaDB" +# MariaDB-devel is required for mysql_config, which is subsequently required for pip install of MySQL-python galera_client_distro_packages: - MariaDB-client + - MariaDB-devel # Galera GPG Keys _galera_client_gpg_keys: diff --git a/vars/suse-42.yml b/vars/suse-42.yml index 0b05d36..851c163 100644 --- a/vars/suse-42.yml +++ b/vars/suse-42.yml @@ -19,8 +19,10 @@ _galera_client_repo: description: "MariaDB Repo" baseurl: "{{ galera_client_repo_url }}" +# MariaDB-devel is required for mysql_config, which is subsequently required for pip install of MySQL-python galera_client_distro_packages: - MariaDB-client + - MariaDB-devel # Galera GPG Keys _galera_client_gpg_keys: diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml index 242d95d..a9eec04 100644 --- a/vars/ubuntu-16.04.yml +++ b/vars/ubuntu-16.04.yml @@ -20,8 +20,10 @@ _galera_client_repo_url: "{{ galera_client_apt_repo_url | default('http://downloads.mariadb.com/MariaDB/mariadb-' ~ galera_client_major_version ~ '.' ~ galera_client_minor_version ~ '/repo/ubuntu') }}" _galera_client_repo: "deb {{ galera_client_repo_url }} {{ ansible_distribution_release }} main" +# libmariadbclient-dev is required for mysql_config, which is subsequently required for pip install of MySQL-python galera_client_distro_packages: - "mariadb-client-core-{{ galera_client_major_version }}" + - libmariadbclient-dev # Galera GPG Keys _galera_client_gpg_keys: diff --git a/vars/ubuntu-18.04.yml b/vars/ubuntu-18.04.yml index 27e776f..12da377 100644 --- a/vars/ubuntu-18.04.yml +++ b/vars/ubuntu-18.04.yml @@ -23,8 +23,10 @@ _galera_client_repo_url: "{{ galera_client_apt_repo_url | default('http://downlo #_galera_client_repo: "deb {{ galera_client_repo_url }} {{ ansible_distribution_release }} main" _galera_client_repo: "deb {{ galera_client_repo_url }} artful main" +# libmariadbclient-dev is required for mysql_config, which is subsequently required for pip install of MySQL-python galera_client_distro_packages: - "mariadb-client-core-{{ galera_client_major_version }}" + - libmariadbclient-dev # Galera GPG Keys _galera_client_gpg_keys: