Merge "Remove redundant common play and add haproxy hosts"

This commit is contained in:
Jenkins 2016-10-03 13:34:42 +00:00 committed by Gerrit Code Review
commit b482611a2d
2 changed files with 15 additions and 5 deletions

View File

@ -1,8 +1,10 @@
--- ---
- include: "{{ action }}.yml" - include: "{{ action }}.yml"
tags: common
when: not common_run when: not common_run
- name: Registering common role has run - name: Registering common role has run
set_fact: set_fact:
common_run: True common_run: True
tags: common
when: not common_run when: not common_run

View File

@ -1,10 +1,17 @@
--- ---
- hosts: # NOTE(awiddersheim): Gather facts for all hosts as a
# first step since several plays below require them when
# building their configurations. The below 'gather_facts'
# set to 'false' is a bit confusing but this is to avoid
# Ansible gathering facts twice.
- name: Gather facts for all hosts
hosts:
- all - all
serial: '{{ serial|default("0") }}' serial: '{{ serial|default("0") }}'
roles: gather_facts: false
- { role: common, tasks:
tags: common } - setup:
tags: always
- hosts: - hosts:
- ceph-mon - ceph-mon
@ -45,7 +52,8 @@
tags: telegraf, tags: telegraf,
when: enable_telegraf | bool } when: enable_telegraf | bool }
- hosts: haproxy - hosts:
- haproxy
roles: roles:
- { role: haproxy, - { role: haproxy,
tags: haproxy, tags: haproxy,