openstack
/
openstack-ansible-galera_client
Code Issues Proposed changes

Merge "Revert "RedHat: Ensure that conflicting MariaDB packages are removed""

This commit is contained in:
Zuul 2018-02-09 09:04:19 +00:00 committed by Gerrit Code Review
parent 7387f107b3 a726ae1ff9
commit ccafe5e816
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tasks/galera_client_install.yml
View File

@ -13,11 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- name: Remove conflicting distro packages
package:
name: "{{ galera_client_mariadb_distro_packages_remove | default([]) }}"
state: absent
- include: "galera_client_install_{{ ansible_pkg_mgr }}.yml"
when:
- galera_client_package_install | bool

8
vars/redhat-7.yml
View File

@ -39,14 +39,6 @@ galera_client_distro_packages:
- openssl-devel
- python-devel
# Conflicting packages with those from the MariaDB repository
galera_client_mariadb_distro_packages_remove:
- mariadb-common
- mariadb-config
- mariadb-server
- mariadb-libs
- mariadb
# Galera GPG Keys
_galera_client_gpg_keys:
- key_name: 'RPM-GPG-KEY-MariaDB'