Cleanup/standardize usage of tags
The numerous tags within the role have been condensed to two tags: memcached-install and memcached-config These tags have been chosen as they are namespaced and cover the two major functions of the role. Change-Id: Iabb2ae9bd314625e76c76aa1155a7918745fcc50
This commit is contained in:
parent
d76fb52cb2
commit
76f4d7db4e
|
@ -20,15 +20,11 @@
|
||||||
stat:
|
stat:
|
||||||
path: /var/cache/apt
|
path: /var/cache/apt
|
||||||
register: apt_cache_stat
|
register: apt_cache_stat
|
||||||
tags:
|
|
||||||
- memcached-apt-packages
|
|
||||||
|
|
||||||
- name: Update apt if needed
|
- name: Update apt if needed
|
||||||
apt:
|
apt:
|
||||||
update_cache: yes
|
update_cache: yes
|
||||||
when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
|
when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
|
||||||
tags:
|
|
||||||
- memcached-apt-packages
|
|
||||||
|
|
||||||
- name: Install apt packages
|
- name: Install apt packages
|
||||||
apt:
|
apt:
|
||||||
|
@ -39,8 +35,6 @@
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 2
|
delay: 2
|
||||||
with_items: "{{ memcached_packages }}"
|
with_items: "{{ memcached_packages }}"
|
||||||
tags:
|
|
||||||
- memcached-apt-packages
|
|
||||||
|
|
||||||
- name: Install apt packages for testing
|
- name: Install apt packages for testing
|
||||||
apt:
|
apt:
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
register: yum_clean
|
register: yum_clean
|
||||||
until: yum_clean | success
|
until: yum_clean | success
|
||||||
tags:
|
tags:
|
||||||
- memcache-yum-packages
|
|
||||||
- skip_ansible_lint
|
- skip_ansible_lint
|
||||||
|
|
||||||
- name: Install yum packages
|
- name: Install yum packages
|
||||||
|
@ -30,8 +29,6 @@
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 2
|
delay: 2
|
||||||
with_items: "{{ memcached_packages }}"
|
with_items: "{{ memcached_packages }}"
|
||||||
tags:
|
|
||||||
- memcache-yum-packages
|
|
||||||
|
|
||||||
- name: Install yum packages for testing
|
- name: Install yum packages for testing
|
||||||
yum:
|
yum:
|
||||||
|
|
|
@ -25,7 +25,11 @@
|
||||||
- always
|
- always
|
||||||
|
|
||||||
- include: memcached_install.yml
|
- include: memcached_install.yml
|
||||||
|
tags:
|
||||||
|
- memcached-install
|
||||||
- include: memcached_config.yml
|
- include: memcached_config.yml
|
||||||
|
tags:
|
||||||
|
- memcached-config
|
||||||
|
|
||||||
- name: Flush handlers
|
- name: Flush handlers
|
||||||
meta: flush_handlers
|
meta: flush_handlers
|
||||||
|
|
|
@ -26,8 +26,6 @@
|
||||||
group: "root"
|
group: "root"
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
notify: Restart memcached
|
notify: Restart memcached
|
||||||
tags:
|
|
||||||
- memcached-config
|
|
||||||
|
|
||||||
- name: Apply resource limits
|
- name: Apply resource limits
|
||||||
template:
|
template:
|
||||||
|
@ -40,8 +38,6 @@
|
||||||
- ansible_pkg_mgr == 'apt'
|
- ansible_pkg_mgr == 'apt'
|
||||||
- memcached_connections > 1024
|
- memcached_connections > 1024
|
||||||
notify: Restart memcached
|
notify: Restart memcached
|
||||||
tags:
|
|
||||||
- memcached-config
|
|
||||||
|
|
||||||
- name: Configure soft file limits
|
- name: Configure soft file limits
|
||||||
lineinfile:
|
lineinfile:
|
||||||
|
|
|
@ -16,11 +16,7 @@
|
||||||
- include: install-apt.yml
|
- include: install-apt.yml
|
||||||
when:
|
when:
|
||||||
- ansible_pkg_mgr == 'apt'
|
- ansible_pkg_mgr == 'apt'
|
||||||
tags:
|
|
||||||
- install-apt
|
|
||||||
|
|
||||||
- include: install-yum.yml
|
- include: install-yum.yml
|
||||||
when:
|
when:
|
||||||
- ansible_pkg_mgr == 'yum'
|
- ansible_pkg_mgr == 'yum'
|
||||||
tags:
|
|
||||||
- install-yum
|
|
||||||
|
|
Loading…
Reference in New Issue