Cleanup role

This patch changes include: to include_tasks: to avoid warnings
in Ansible 2.4+. It also removes systemd conditionals since all
supported distributions have systemd.

Change-Id: Ic13886e8861d9fa00246eb849e6681d297291d2f
This commit is contained in:
Major Hayden 2018-02-15 09:35:17 -06:00
parent 58d7ed3ac6
commit ef3a0af203
No known key found for this signature in database
GPG Key ID: 737051E0C1011FB1
5 changed files with 12 additions and 12 deletions

View File

@ -31,11 +31,11 @@
name: "haproxy"
state: "restarted"
enabled: yes
daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
daemon_reload: yes
- name: Restart rsyslog
service:
name: "rsyslog"
state: "restarted"
enabled: yes
daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
daemon_reload: yes

View File

@ -39,6 +39,6 @@
tags:
- haproxy-logging-config
- include: haproxy_service_config.yml
- include_tasks: haproxy_service_config.yml
tags:
- haproxy-service-config

View File

@ -20,9 +20,9 @@
tags:
- haproxy-ssl
- include: haproxy_ssl_self_signed.yml
- include_tasks: haproxy_ssl_self_signed.yml
when:
- haproxy_ssl | bool
- haproxy_user_ssl_cert is not defined or haproxy_user_ssl_key is not defined
- include: haproxy_ssl_user_provided.yml
- include_tasks: haproxy_ssl_user_provided.yml

View File

@ -13,11 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- include: haproxy_ssl_key_create.yml
- include_tasks: haproxy_ssl_key_create.yml
when: inventory_hostname == ansible_play_hosts[0]
- include: haproxy_ssl_key_store.yml
- include_tasks: haproxy_ssl_key_store.yml
when: inventory_hostname == ansible_play_hosts[0]
- include: haproxy_ssl_key_distribute.yml
- include_tasks: haproxy_ssl_key_distribute.yml
when: inventory_hostname != ansible_play_hosts[0]

View File

@ -23,19 +23,19 @@
tags:
- always
- include: haproxy_pre_install.yml
- include_tasks: haproxy_pre_install.yml
tags:
- haproxy_server-install
- include: haproxy_install.yml
- include_tasks: haproxy_install.yml
tags:
- haproxy_server-install
- include: haproxy_ssl.yml
- include_tasks: haproxy_ssl.yml
when: haproxy_ssl | bool
tags:
- haproxy_server-config
- include: haproxy_post_install.yml
- include_tasks: haproxy_post_install.yml
tags:
- haproxy_server-config