Merge "Avoid mixing pip and distribution packages."

This commit is contained in:
Zuul 2018-04-23 17:27:10 +00:00 committed by Gerrit Code Review
commit 7daa94e69b
5 changed files with 6 additions and 18 deletions

View File

@ -118,12 +118,6 @@ galera_xtrabackup_compression: "{{ (ansible_architecture == 'x86_64') or (ansibl
# xtrabackup parallel/compression/sync threads
galera_xtrabackup_threads: 4
galera_pip_packages:
- MySQL-python
- pycrypto
galera_pip_package_state: "latest"
# Galera slow/unindexed query logging
galera_slow_query_logging: 0
galera_unindexed_query_logging: 0

View File

@ -40,18 +40,6 @@
- include_tasks: "galera_install_{{ ansible_pkg_mgr }}.yml"
- name: Install pip packages
pip:
name: "{{ galera_pip_packages }}"
state: "{{ galera_pip_package_state }}"
extra_args: >-
{{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
{{ pip_install_options | default('') }}
register: install_packages
until: install_packages|success
retries: 5
delay: 2
- name: Record galera has been deployed
ini_file:
dest: "/etc/ansible/facts.d/openstack_ansible.fact"

View File

@ -33,6 +33,8 @@ galera_server_required_distro_packages:
- libgcrypt
- MariaDB-client
- MariaDB-devel
- MySQL-python # needed by mysql_user
- python-crypto # needed for ssl
- xinetd
galera_etc_conf_file: "/etc/mysql/my.cnf"

View File

@ -30,6 +30,8 @@ galera_server_required_distro_packages:
- libgcrypt-devel
- MariaDB-client
- MariaDB-devel
- python-MySQL-python # needed by mysql_user
- python2-pycrypto # needed for ssl
- xinetd
galera_etc_conf_file: "/etc/mysql/my.cnf"

View File

@ -38,6 +38,8 @@ galera_server_required_distro_packages:
- libgcc1
- libgcrypt20
- libstdc++6
- python-mysqldb # needed by mysql_user
- python-crypto # needed for ssl
- python-software-properties
- software-properties-common
- xinetd