diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-03 13:34:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-03 13:34:42 +0000 |
| commit | b482611a2d50451c096e6a48eb48edd804a2011b (patch) | |
| tree | fba6935e422a5cd514307f887bc6610506af4792 | |
| parent | 74c508faa5ff3c22abcc69e642874878e0d55957 (diff) | |
| parent | 4963898b21d407a6e702c39f7576b817c5d24119 (diff) | |
| download | kolla-b482611a2d50451c096e6a48eb48edd804a2011b.tar.gz kolla-b482611a2d50451c096e6a48eb48edd804a2011b.zip | |
Merge "Remove redundant common play and add haproxy hosts"
| -rw-r--r-- | ansible/roles/common/tasks/main.yml | 2 | ||||
| -rw-r--r-- | ansible/site.yml | 18 |
2 files changed, 15 insertions, 5 deletions
diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml index e261f83ee..c65c9e858 100644 --- a/ansible/roles/common/tasks/main.yml +++ b/ansible/roles/common/tasks/main.yml @@ -1,8 +1,10 @@ --- - include: "{{ action }}.yml" + tags: common when: not common_run - name: Registering common role has run set_fact: common_run: True + tags: common when: not common_run diff --git a/ansible/site.yml b/ansible/site.yml index 526303236..dbe0f757c 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -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 serial: '{{ serial|default("0") }}' - roles: - - { role: common, - tags: common } + gather_facts: false + tasks: + - setup: + tags: always - hosts: - ceph-mon @@ -45,7 +52,8 @@ tags: telegraf, when: enable_telegraf | bool } -- hosts: haproxy +- hosts: + - haproxy roles: - { role: haproxy, tags: haproxy, |