lifecycle: build inventory and wait for instances

ansible/configs/ocp4-cluster/lifecycle_hook_post_start.yml

@@ -1,40 +1,5 @@
 ---
 # Post Start actions for OCP 4 Cluster configs
-
-- name: Build inventory
-  hosts: localhost
-  connection: local
-  gather_facts: false
-  become: false
-  tasks:
-    - when: cloud_provider == 'ec2'
-      name: Run infra-ec2-create-inventory Role
-      include_role:
-        name: infra-ec2-create-inventory
-
-    - when: cloud_provider == 'osp'
-      name: Run infra-osp-create-inventory Role
-      include_role:
-        name: infra-osp-create-inventory
-
-    - name: Azure post start actions
-      when: cloud_provider == 'azure'
-      include_role:
-        name: infra-azure-create-inventory
-
-- name: Set ansible_ssh_extra_args
-  hosts:
-    - all:!windows:!network
-  gather_facts: false
-  any_errors_fatal: true
-  ignore_errors: false
-  tasks:
-    - name: Set facts for remote access
-      set_fact:
-        ansible_ssh_extra_args: >-
-          {{ ansible_ssh_extra_args|d() }}
-          -F {{hostvars.localhost.output_dir}}/{{ env_type }}_{{ guid }}_ssh_conf
-
 - name: Run recover cluster actions
   hosts: bastions
   run_once: true

ansible/configs/ocs4-external-implementation/lifecycle_hook_post_start.yml

@@ -1,36 +1,5 @@
 ---
 # Post Start actions for OCP 4 Cluster configs
-
-- name: Build inventory
-  hosts: localhost
-  connection: local
-  gather_facts: false
-  become: false
-  tasks:
-  - when: cloud_provider == 'ec2'
-    block:
-    - name: Run infra-ec2-create-inventory Role
-      include_role:
-        name: infra-ec2-create-inventory
-
-    - name: Run Common SSH Config Generator Role
-      include_role:
-        name: infra-common-ssh-config-generate
-      when: "'bastions' in groups"
-
-- name: Set ansible_ssh_extra_args
-  hosts:
-  - all:!windows:!network
-  gather_facts: false
-  any_errors_fatal: true
-  ignore_errors: false
-  tasks:
-  - name: Set facts for remote access
-    set_fact:
-      ansible_ssh_extra_args: >-
-        {{ ansible_ssh_extra_args|d() }}
-        -F {{hostvars.localhost.output_dir}}/{{ env_type }}_{{ guid }}_ssh_conf
-
 - name: Run recover cluster actions
   hosts: bastions
   run_once: true

ansible/configs/sap-integration/lifecycle_hook_post_start.yml

@@ -1,45 +1,5 @@
 ---
 # Post Start actions for OCP 4 Cluster configs
-
-- name: Build inventory
-  hosts: localhost
-  connection: local
-  gather_facts: false
-  become: false
-  tasks:
-  - when: cloud_provider == 'ec2'
-    name: Run infra-ec2-create-inventory Role
-    include_role:
-      name: infra-ec2-create-inventory
-
-  - when: cloud_provider == 'osp'
-    name: Run infra-osp-create-inventory Role
-    include_role:
-      name: infra-osp-create-inventory
-
-  - when: cloud_provider == 'azure'
-    name: Run infra-azure-create-inventory Role
-    include_role:
-      name: infra-azure-create-inventory
-
-  - name: Run Common SSH Config Generator Role
-    include_role:
-      name: infra-common-ssh-config-generate
-    when: "'bastions' in groups"
-
-- name: Set ansible_ssh_extra_args
-  hosts:
-  - all:!windows:!network
-  gather_facts: false
-  any_errors_fatal: true
-  ignore_errors: false
-  tasks:
-  - name: Set facts for remote access
-    set_fact:
-      ansible_ssh_extra_args: >-
-        {{ ansible_ssh_extra_args|d() }}
-        -F {{hostvars.localhost.output_dir}}/{{ env_type }}_{{ guid }}_ssh_conf
-
 - name: Run recover cluster actions
   hosts: bastions
   run_once: true

ansible/lifecycle_entry_point.yml

@@ -11,6 +11,19 @@
        })
     }}
 
+- name: Wait for instances to be up and build inventory before calling hooks
+  vars:
+    _params:
+      files:
+        - configs/{{ env_type }}/lifecycle_hook_post_{{ ACTION }}.yml
+        - configs/{{ env_type }}/lifecycle_hook.yml
+        - noop.yml
+  import_playbook: >-
+    {{ 'noop.yml' if 'noop.yml'
+    in lookup('first_found', _params)
+    else 'lifecycle_wait_and_build_inventory.yml'
+    }}
+
 - name: Call Lifecycle Post Hook
   vars:
     _params:

ansible/lifecycle_wait_and_build_inventory.yml

@@ -0,0 +1,34 @@
+---
+- name: Build inventory
+  hosts: localhost
+  connection: local
+  gather_facts: false
+  become: false
+  tasks:
+    - name: Run infra-{{ cloud_provider }}-create-inventory Role
+      include_role:
+        name: infra-{{ cloud_provider }}-create-inventory
+
+
+# include global vars again, for all hosts
+- import_playbook: include_vars.yml
+  tags:
+    - create_inventory
+    - must
+
+- name: Set ansible_ssh_extra_args and wait for connection
+  hosts:
+    - all:!windows:!network
+  gather_facts: false
+  any_errors_fatal: true
+  ignore_errors: false
+  tasks:
+    - name: Set facts for remote access
+      set_fact:
+        ansible_ssh_extra_args: >-
+          {{ ansible_ssh_extra_args|d() }}
+          -F {{hostvars.localhost.output_dir}}/{{ env_type }}_{{ guid }}_ssh_conf
+
+    - name: Run infra-generic-wait_for_linux_hosts Role
+      include_role:
+        name: infra-generic-wait_for_linux_hosts

ansible/noop.yml

@@ -0,0 +1,7 @@
+---
+# Noop play for plumbing: it allows fallback to an existing file/play
+- hosts: localhost
+  name: noop
+  connection: local
+  become: false
+  gather_facts: false