From 41f120918643a0db84d6dcc2b5f1089e30436cd8 Mon Sep 17 00:00:00 2001
From: Rick Elrod <rick@elrod.me>
Date: Mon, 7 Dec 2020 16:09:15 -0600
Subject: [PATCH] [2.8] [cloud_init_data_facts tests] fix for centos8 (#72886)
 (#72888)

Change:
- `udev` is provided by `systemd-udev`, which our `state=present` check
  doesn't match. For now, work around this so we don't end up trying to
  upgrade all of systemd.
- In the future, we should discuss if the `yum` module does the right
  thing here.

Test Plan:
- Locally in docker
- CI

Signed-off-by: Rick Elrod <rick@elrod.me>
(cherry picked from commit 8eaa7423d45602822d599c8ef65b7d3dfb328d15)
---
 .../cloud_init_data_facts/tasks/main.yml       | 18 +++++++++++++++---
 .../cloud_init_data_facts/vars/CentOS-7.yml    |  3 +++
 .../cloud_init_data_facts/vars/CentOS-8.yml    |  3 +++
 .../cloud_init_data_facts/vars/default.yml     |  3 +++
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 test/integration/targets/cloud_init_data_facts/vars/CentOS-7.yml
 create mode 100644 test/integration/targets/cloud_init_data_facts/vars/CentOS-8.yml
 create mode 100644 test/integration/targets/cloud_init_data_facts/vars/default.yml

diff --git a/test/integration/targets/cloud_init_data_facts/tasks/main.yml b/test/integration/targets/cloud_init_data_facts/tasks/main.yml
index eca905c6c2b..c65f96370c3 100644
--- a/test/integration/targets/cloud_init_data_facts/tasks/main.yml
+++ b/test/integration/targets/cloud_init_data_facts/tasks/main.yml
@@ -11,11 +11,23 @@
   - not (ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int == 14)
   - not (ansible_os_family == "Suse" and ansible_distribution_major_version|int != 42 and ansible_python.version.major != 3)
   block:
+  - name: Include distribution specific variables
+    include_vars: "{{ lookup('first_found', params) }}"
+    vars:
+      params:
+        files:
+        - "{{ ansible_facts.distribution }}-{{ ansible_facts.distribution_major_version }}.yml"
+        - "{{ ansible_facts.os_family }}.yml"
+        - default.yml
+        paths:
+        - "{{ role_path }}/vars"
+
+  - debug:
+      var: pkgs_required
+
   - name: setup install cloud-init
     package:
-      name:
-      - cloud-init
-      - udev
+      name: "{{ pkgs_required }}"
 
   - name: setup run cloud-init
     service:
diff --git a/test/integration/targets/cloud_init_data_facts/vars/CentOS-7.yml b/test/integration/targets/cloud_init_data_facts/vars/CentOS-7.yml
new file mode 100644
index 00000000000..536f64a262e
--- /dev/null
+++ b/test/integration/targets/cloud_init_data_facts/vars/CentOS-7.yml
@@ -0,0 +1,3 @@
+pkgs_required:
+  - cloud-init
+  - systemd # This provides 'udev' as a virtual pkg
diff --git a/test/integration/targets/cloud_init_data_facts/vars/CentOS-8.yml b/test/integration/targets/cloud_init_data_facts/vars/CentOS-8.yml
new file mode 100644
index 00000000000..4485be23ff0
--- /dev/null
+++ b/test/integration/targets/cloud_init_data_facts/vars/CentOS-8.yml
@@ -0,0 +1,3 @@
+pkgs_required:
+  - cloud-init
+  - systemd-udev
diff --git a/test/integration/targets/cloud_init_data_facts/vars/default.yml b/test/integration/targets/cloud_init_data_facts/vars/default.yml
new file mode 100644
index 00000000000..69ab47bf019
--- /dev/null
+++ b/test/integration/targets/cloud_init_data_facts/vars/default.yml
@@ -0,0 +1,3 @@
+pkgs_required:
+  - cloud-init
+  - udev