Return facts gathering to pre_tasks for masakari
We don't have pacemaker_corosync_ring_interface defined outside of pacemaker_corosync_group and it won't be consistent across hosts. As it might include mix of containers/bare metal hosts, so interface name might be inconsistent. So let's not bring too much complexity for default option and just revert to old good working solution. This partially reverts change Ie996262043edb8fb9c7221a5cd98e98a0111ac28 and I75bdab29353f33fa009bf9a7ff1f565f1660ed59 Closes-Bug: #1979145 Change-Id: I4099c66fd37813b6a4c6e5b8a312a12647969e71
This commit is contained in:
parent
8b20eb6e33
commit
8bc9b167ab
@ -13,20 +13,6 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
- name: Gather masakari facts
|
||||
hosts: masakari_all
|
||||
gather_facts: "{{ osa_gather_facts | default(True) }}"
|
||||
vars:
|
||||
pacemaker_corosync_ring_interface: "{{ masakari_monitor_corosync_multicast_interface }}"
|
||||
tasks:
|
||||
- name: Gather additional facts
|
||||
include_tasks: "common-tasks/gather-hardware-facts.yml"
|
||||
vars:
|
||||
deployment_extra_facts_filter: "{{ 'ansible_' ~ pacemaker_corosync_ring_interface | replace('-','_') }}"
|
||||
deployment_extra_facts_subset: "!all,network"
|
||||
tags:
|
||||
- always
|
||||
|
||||
- name: Setup corosync cluster
|
||||
hosts: masakari_monitor
|
||||
gather_facts: false
|
||||
@ -36,6 +22,18 @@
|
||||
pacemaker_corosync_group: masakari_monitor
|
||||
pacemaker_corosync_ring_interface: "{{ masakari_monitor_corosync_multicast_interface }}"
|
||||
haveged_enabled: false
|
||||
pre_tasks:
|
||||
- name: Gather additional facts
|
||||
include_tasks: "common-tasks/gather-hardware-facts.yml"
|
||||
vars:
|
||||
deployment_extra_facts_filter: "{{ 'ansible_' ~ pacemaker_corosync_ring_interface | replace('-','_') }}"
|
||||
deployment_extra_facts_subset: "!all,network"
|
||||
args:
|
||||
apply:
|
||||
tags:
|
||||
- always
|
||||
tags:
|
||||
- always
|
||||
roles:
|
||||
- role: "pacemaker_corosync"
|
||||
tags: pacemaker-corosync
|
||||
@ -49,6 +47,15 @@
|
||||
- "defaults/repo_packages/openstack_services.yml"
|
||||
- "defaults/{{ install_method }}_install.yml"
|
||||
pre_tasks:
|
||||
- name: Gather additional facts
|
||||
include_tasks: "common-tasks/gather-hardware-facts.yml"
|
||||
args:
|
||||
apply:
|
||||
tags:
|
||||
- always
|
||||
tags:
|
||||
- always
|
||||
|
||||
# In order to ensure that any container, software or
|
||||
# config file changes which causes a container/service
|
||||
# restart do not cause an unexpected outage, we drain
|
||||
|
Loading…
Reference in New Issue
Block a user