Cleanup Galera client role
This patch does a few cleanups: * Removes jinja2 content from when * Switches to package module to install pkgs * Pass package lists as a list (not with_items) Change-Id: I50e7029053fb21cedcee6a8e122f0442f1d587ff
This commit is contained in:
parent
0e5db2cdd6
commit
fba14dd205
|
@ -21,6 +21,23 @@
|
|||
- install-yum
|
||||
- install-zypper
|
||||
|
||||
- name: Install galera distro packages
|
||||
package:
|
||||
name: "{{ galera_client_distro_packages }}"
|
||||
state: "{{ galera_client_package_state }}"
|
||||
update_cache: "{{ (ansible_pkg_mgr in ['apt', 'zypper']) | ternary('yes', omit) }}"
|
||||
cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}"
|
||||
register: install_packages
|
||||
until: install_packages | success
|
||||
retries: 5
|
||||
delay: 2
|
||||
when:
|
||||
- galera_client_package_install | bool
|
||||
tags:
|
||||
- galera-client-apt-packages
|
||||
- galera-client-yum-packages
|
||||
- galera-client-zypper-packages
|
||||
|
||||
- name: Install pip packages
|
||||
pip:
|
||||
name: "{{ galera_client_pip_packages }}"
|
||||
|
|
|
@ -94,16 +94,3 @@
|
|||
delay: 2
|
||||
tags:
|
||||
- galera-client-repos
|
||||
|
||||
- name: Install galera packages
|
||||
apt:
|
||||
pkg: "{{ item }}"
|
||||
state: "{{ galera_client_package_state }}"
|
||||
register: install_packages
|
||||
until: install_packages | success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ galera_client_distro_packages }}"
|
||||
when: "{{ item | length > 0 }}"
|
||||
tags:
|
||||
- galera-client-apt-packages
|
||||
|
|
|
@ -84,16 +84,3 @@
|
|||
- "{{ galera_client_repo }}"
|
||||
tags:
|
||||
- galera-repos
|
||||
|
||||
- name: Install galera yum packages
|
||||
yum:
|
||||
pkg: "{{ item }}"
|
||||
state: "{{ galera_client_package_state }}"
|
||||
register: install_packages
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ galera_client_distro_packages }}"
|
||||
when: "{{ item | length > 0 }}"
|
||||
tags:
|
||||
- galera-pre-yum-packages
|
||||
|
|
|
@ -35,15 +35,3 @@
|
|||
tags:
|
||||
- skip_ansible_lint
|
||||
- galera-repos
|
||||
|
||||
- name: Install galera zypper packages
|
||||
zypper:
|
||||
name: "{{ item }}"
|
||||
state: "{{ galera_client_package_state }}"
|
||||
register: install_packages
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ galera_client_distro_packages }}"
|
||||
tags:
|
||||
- galera-pre-zypper-packages
|
||||
|
|
Loading…
Reference in New Issue