ansible: Add el9 nodes

Change-Id: I96cca092024f4476d991010e2ccf17f222ba3fbd
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>

diff --git a/automation/ansible/hosts b/automation/ansible/hosts
index 11950fa25373c23293b532296cf019604b78ae5d..fcb6ee3368e9b38ba745faf1536216dfe3bdcdac 100644 (file)
--- a/automation/ansible/hosts
+++ b/automation/ansible/hosts
@@ -98,8 +98,9 @@ ci-rootnode-bionic-amd64-06
 [node_sles]
 ci-node-sles12sp5-amd64-03-01
 
-[node_el8]
+[node_el]
 ci-node-el8-amd64-03-01
+ci-node-el9-amd64-02-01
 
 [node:children]
 node_i386
@@ -110,7 +111,7 @@ node_powerpc
 node_ppc64el
 node_standalone
 node_sles
-node_el8
+node_el
 
 [py3_hosts:children]
 node

diff --git a/automation/ansible/node_el.yml b/automation/ansible/node_el.yml
new file mode 100644 (file)
index 0000000..e6d658b
--- /dev/null
+++ b/automation/ansible/node_el.yml
@@ -0,0 +1,7 @@
+- hosts: node_el
+  roles:
+    - common
+    - babeltrace
+    - liburcu
+    - lttng-ust
+    - lttng-tools

diff --git a/automation/ansible/node_el8.yml b/automation/ansible/node_el8.yml
deleted file mode 100644 (file)
index edf32fc..0000000
--- a/automation/ansible/node_el8.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- hosts: node_el8
-  roles:
-    - common
-    - babeltrace
-    - liburcu
-    - lttng-ust
-    - lttng-tools

diff --git a/automation/ansible/roles/babeltrace/tasks/main.yml b/automation/ansible/roles/babeltrace/tasks/main.yml
index 2967331fb9598a66cba280482b16ade7ba3d6ccf..cd37dff67394b7b1737579ff33e2d12f9395a318 100644 (file)
--- a/automation/ansible/roles/babeltrace/tasks/main.yml
+++ b/automation/ansible/roles/babeltrace/tasks/main.yml
@@ -1,16 +1,15 @@
 ---
 # Include variables and define needed variables.
 - name: Include OS-specific variables.
-  include_vars: "{{ ansible_os_family }}.yml"
-
-- name: Define babeltrace_packages.
-  set_fact:
-    babeltrace_packages: "{{ __babeltrace_packages | list }}"
-  when: babeltrace_packages is not defined
+  include_vars: "{{ item }}"
+  with_first_found:
+    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
+    - "{{ ansible_distribution }}.yml"
+    - "{{ ansible_os_family }}.yml"
 
 # Setup/install tasks.
 - include: setup-RedHat.yml
-  when: ansible_os_family == 'RedHat'
+  when: ansible_os_family in ['RedHat', 'Rocky']
 
 - include: setup-Debian.yml
   when: ansible_os_family == 'Debian'

diff --git a/automation/ansible/roles/babeltrace/vars/Alpine.yml b/automation/ansible/roles/babeltrace/vars/Alpine.yml
index d0ccd65311b6e565031fe23527938fc4386266fc..5873d7bcd10d0b5d41c1e15fda002365448fc317 100644 (file)
--- a/automation/ansible/roles/babeltrace/vars/Alpine.yml
+++ b/automation/ansible/roles/babeltrace/vars/Alpine.yml
@@ -1,11 +1,11 @@
 ---
-__babeltrace_packages:
+babeltrace_packages:
+  - chrpath
+  - glib-dev
+  - libdwarf-dev
+  - libelf-dev
   - popt-dev
-  - util-linux-dev
   - python3-dev
 #  - python3-sphinx
   - swig
-  - glib-dev
-  - libdwarf-dev
-  - libelf-dev
-  - chrpath
+  - util-linux-dev

diff --git a/automation/ansible/roles/babeltrace/vars/Debian.yml b/automation/ansible/roles/babeltrace/vars/Debian.yml
index 5601d9c6d1e13bd0c050e8dd0621e4de2a919aca..dc9e024856ba4e4d2b807ab780c3ef8c158fcba2 100644 (file)
--- a/automation/ansible/roles/babeltrace/vars/Debian.yml
+++ b/automation/ansible/roles/babeltrace/vars/Debian.yml
@@ -1,11 +1,11 @@
 ---
-__babeltrace_packages:
+babeltrace_packages:
+  - chrpath
+  - libdw-dev
+  - libelf-dev
+  - libglib2.0-dev
   - libpopt-dev
-  - uuid-dev
   - python3-dev
   - python3-sphinx
   - swig
-  - libglib2.0-dev
-  - libdw-dev
-  - libelf-dev
-  - chrpath
+  - uuid-dev

diff --git a/automation/ansible/roles/babeltrace/vars/RedHat-8.yml b/automation/ansible/roles/babeltrace/vars/RedHat-8.yml
new file mode 100644 (file)
index 0000000..65e1992
--- /dev/null
+++ b/automation/ansible/roles/babeltrace/vars/RedHat-8.yml
@@ -0,0 +1,10 @@
+---
+babeltrace_packages:
+  - chrpath
+  - elfutils-devel
+  - glib2-devel
+  - libuuid-devel
+  - popt-devel
+  - python36-devel
+  - python3-sphinx
+  - swig

diff --git a/automation/ansible/roles/babeltrace/vars/RedHat-9.yml b/automation/ansible/roles/babeltrace/vars/RedHat-9.yml
new file mode 100644 (file)
index 0000000..b94e738
--- /dev/null
+++ b/automation/ansible/roles/babeltrace/vars/RedHat-9.yml
@@ -0,0 +1,10 @@
+---
+babeltrace_packages:
+  - chrpath
+  - elfutils-devel
+  - glib2-devel
+  - libuuid-devel
+  - popt-devel
+  - python3-devel
+  - python3-sphinx
+  - swig

diff --git a/automation/ansible/roles/babeltrace/vars/RedHat.yml b/automation/ansible/roles/babeltrace/vars/RedHat.yml
deleted file mode 100644 (file)
index 6e165b5..0000000
--- a/automation/ansible/roles/babeltrace/vars/RedHat.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-__babeltrace_packages:
-  - popt-devel
-  - libuuid-devel
-  - python36-devel
-  - python3-sphinx
-  - swig
-  - glib2-devel
-  - elfutils-devel
-  - chrpath

diff --git a/automation/ansible/roles/babeltrace/vars/Rocky-8.yml b/automation/ansible/roles/babeltrace/vars/Rocky-8.yml
new file mode 100644 (file)
index 0000000..65e1992
--- /dev/null
+++ b/automation/ansible/roles/babeltrace/vars/Rocky-8.yml
@@ -0,0 +1,10 @@
+---
+babeltrace_packages:
+  - chrpath
+  - elfutils-devel
+  - glib2-devel
+  - libuuid-devel
+  - popt-devel
+  - python36-devel
+  - python3-sphinx
+  - swig

diff --git a/automation/ansible/roles/babeltrace/vars/Rocky-9.yml b/automation/ansible/roles/babeltrace/vars/Rocky-9.yml
new file mode 100644 (file)
index 0000000..b94e738
--- /dev/null
+++ b/automation/ansible/roles/babeltrace/vars/Rocky-9.yml
@@ -0,0 +1,10 @@
+---
+babeltrace_packages:
+  - chrpath
+  - elfutils-devel
+  - glib2-devel
+  - libuuid-devel
+  - popt-devel
+  - python3-devel
+  - python3-sphinx
+  - swig

diff --git a/automation/ansible/roles/babeltrace/vars/Suse.yml b/automation/ansible/roles/babeltrace/vars/Suse.yml
index 16d2724f01e9be4f7e44306ccb37b3c7f220d429..f289bf16ecfc01222684faad07d4e4705ecc1fa9 100644 (file)
--- a/automation/ansible/roles/babeltrace/vars/Suse.yml
+++ b/automation/ansible/roles/babeltrace/vars/Suse.yml
@@ -1,12 +1,12 @@
 ---
-__babeltrace_packages:
-  - popt-devel
-  - libuuid-devel
-  - python3-devel
-#  - python3-sphinx
-  - swig
+babeltrace_packages:
+  - chrpath
   - glib2-devel
   - glib2-devel-static
   - libdw-devel
   - libelf-devel
-  - chrpath
+  - libuuid-devel
+  - popt-devel
+  - python3-devel
+#  - python3-sphinx
+  - swig

diff --git a/automation/ansible/roles/common/tasks/main.yml b/automation/ansible/roles/common/tasks/main.yml
index 460325e8ca31dc899997beda9b41ff658cf9399c..68ac041b89fe08618df78f372737ad69883fd2a7 100644 (file)
--- a/automation/ansible/roles/common/tasks/main.yml
+++ b/automation/ansible/roles/common/tasks/main.yml
@@ -1,16 +1,15 @@
 ---
 # Include variables and define needed variables.
 - name: Include OS-specific variables.
-  include_vars: "{{ ansible_os_family }}.yml"
-
-- name: Define common_packages.
-  set_fact:
-    common_packages: "{{ __common_packages | list }}"
-  when: common_packages is not defined
+  include_vars: "{{ item }}"
+  with_first_found:
+    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
+    - "{{ ansible_distribution }}.yml"
+    - "{{ ansible_os_family }}.yml"
 
 # Setup/install tasks.
 - include: setup-RedHat.yml
-  when: ansible_os_family == 'RedHat'
+  when: ansible_os_family in ['RedHat', 'Rocky']
 
 - include: setup-Debian.yml
   when: ansible_os_family == 'Debian'

diff --git a/automation/ansible/roles/common/tasks/setup-Suse.yml b/automation/ansible/roles/common/tasks/setup-Suse.yml
index 4123ed1612d39527f3ffa61978d4d253b94a8af3..85f1e21e9eff96ea0cf1e7c295e476c42cbc9912 100644 (file)
--- a/automation/ansible/roles/common/tasks/setup-Suse.yml
+++ b/automation/ansible/roles/common/tasks/setup-Suse.yml
@@ -1,9 +1,4 @@
 ---
-- name: Define common_patterns.
-  set_fact:
-    common_patterns: "{{ __common_patterns | list }}"
-  when: common_patterns is not defined
-
 - name: Ensure common patterns are installed.
   zypper: "name={{ common_patterns }} type=pattern state=present update_cache=yes"
 

diff --git a/automation/ansible/roles/common/vars/Alpine.yml b/automation/ansible/roles/common/vars/Alpine.yml
index 9c37336ea5687bd64e204c29b52b64fd81f68ae7..3679fe623319b203a60a15ab2765553692cbd507 100644 (file)
--- a/automation/ansible/roles/common/vars/Alpine.yml
+++ b/automation/ansible/roles/common/vars/Alpine.yml
@@ -1,27 +1,27 @@
 ---
-__common_packages:
-  - sudo
-  - openjdk11
-  - git
-  - vim
-  - tree
-  - htop
+common_packages:
   - alpine-sdk
-  - clang
-  - automake
   - autoconf
-  - libtool
+  - automake
+  - bash
   - bison
-  - flex
-  - perl
-  - jq
-  - cppcheck
+  - clang
   - cloc
-  - py-virtualenv
+  - coreutils
+  - cppcheck
   - curl
+  - flex
   - gettext
+  - git
+  - htop
+  - jq
+  - libtool
+  - openjdk11
   - openssl-dev
-  - coreutils
-  - bash
-  - shadow
+  - perl
+  - py-virtualenv
   - rsync
+  - shadow
+  - sudo
+  - tree
+  - vim

diff --git a/automation/ansible/roles/common/vars/Debian.yml b/automation/ansible/roles/common/vars/Debian.yml
index 42d9ac3a5ab5f192cbb80394a180bce492331a53..230c90d8f8123334d13b124d96d68c9be5134fdb 100644 (file)
--- a/automation/ansible/roles/common/vars/Debian.yml
+++ b/automation/ansible/roles/common/vars/Debian.yml
@@ -1,30 +1,30 @@
 ---
-__common_packages:
-  - openssh-server
-  - sudo
-  - default-jdk-headless
-  - git
-  - vim
-  - emacs-nox
-  - tree
-  - htop
+common_packages:
+  - autoconf
+  - automake
+  - bison
   - build-essential
   - clang
   - clang-tools
-  - automake
-  - autoconf
-  - libtool-bin
-  - bison
-  - flex
-  - libtap-harness-archive-perl
-  - jq
-  - cppcheck
   - cloc
-  - virtualenv
+  - cppcheck
   - curl
+  - default-jdk-headless
+  - emacs-nox
+  - flex
   - gettext
+  - git
+  - htop
+  - jq
   - libssl-dev
+  - libtap-harness-archive-perl
+  - libtool-bin
+  - lzop
+  - openssh-server
+  - pbzip2
   - psmisc
   - rsync
-  - pbzip2
-  - lzop
+  - sudo
+  - tree
+  - vim
+  - virtualenv

diff --git a/automation/ansible/roles/common/vars/RedHat.yml b/automation/ansible/roles/common/vars/RedHat.yml
index 3fea458204352e1d6ebddbde6a68ee50f933bf0e..f837385c8150969c7c43de5c74d38e789e42a91e 100644 (file)
--- a/automation/ansible/roles/common/vars/RedHat.yml
+++ b/automation/ansible/roles/common/vars/RedHat.yml
@@ -1,30 +1,25 @@
 ---
-__common_packages:
-  - openssh-server
-  - sudo
-  - java-11-openjdk-headless
-  - git
-  - vim
-  - emacs-nox
-  - tree
-  - htop
-#  - build-essential
-  - clang
-#  - clang-tools
-  - automake
+common_packages:
   - autoconf
-  - libtool
+  - automake
   - bison
-  - flex
-  - perl-Test-Harness
-  - jq
-#  - cppcheck
-#  - cloc
-  - python3-virtualenv
+  - clang
   - curl
+  - emacs-nox
+  - flex
   - gettext
+  - git
+  - htop
+  - java-11-openjdk-headless
+  - jq
+  - libtool
+  - lzop
+  - openssh-server
   - openssl-devel
+  - perl-Test-Harness
   - psmisc
+  - python3-virtualenv
   - rsync
-#  - pbzip2
-  - lzop
+  - sudo
+  - tree
+  - vim

diff --git a/automation/ansible/roles/common/vars/Rocky.yml b/automation/ansible/roles/common/vars/Rocky.yml
new file mode 120000 (symlink)
index 0000000..f802000
--- /dev/null
+++ b/automation/ansible/roles/common/vars/Rocky.yml
@@ -0,0 +1 @@
+RedHat.yml
\ No newline at end of file

diff --git a/automation/ansible/roles/common/vars/Suse.yml b/automation/ansible/roles/common/vars/Suse.yml
index bf2f0103d841cbcfb6a4a3238f73ba9b3e368bdd..acf1ec60332d5e35d09d742fd2a1c692043be93f 100644 (file)
--- a/automation/ansible/roles/common/vars/Suse.yml
+++ b/automation/ansible/roles/common/vars/Suse.yml
@@ -1,29 +1,26 @@
 ---
-__common_patterns:
+common_patterns:
   - base
   - Minimal
   - Basis-Devel
 
-__common_packages:
-  - openssh
-  - sudo
-  - java-11-openjdk-headless
-  - java-11-openjdk-devel
-  - git-core
-  - vim
-  - tree
-#  - htop
-  - automake
+common_packages:
   - autoconf
-  - libtool
+  - automake
   - bison
-  - flex
-#  - libtap-harness-archive-perl
-#  - jq
-#  - cppcheck
-#  - cloc
-#  - python-virtualenv
   - curl
+  - flex
   - gettext-runtime
+  - git-core
+  - java-11-openjdk-devel
+  - java-11-openjdk-headless
+#  - jq
   - libopenssl-devel
+#  - libtap-harness-archive-perl
+  - libtool
+  - openssh
   - psmisc
+#  - python-virtualenv
+  - sudo
+  - tree
+  - vim

diff --git a/automation/ansible/roles/liburcu/tasks/main.yml b/automation/ansible/roles/liburcu/tasks/main.yml
index 6bceb9be97249e657dfc1dc6d67dc894d97015d3..cd37dff67394b7b1737579ff33e2d12f9395a318 100644 (file)
--- a/automation/ansible/roles/liburcu/tasks/main.yml
+++ b/automation/ansible/roles/liburcu/tasks/main.yml
@@ -1,16 +1,15 @@
 ---
 # Include variables and define needed variables.
 - name: Include OS-specific variables.
-  include_vars: "{{ ansible_os_family }}.yml"
-
-- name: Define liburcu_packages.
-  set_fact:
-    liburcu_packages: "{{ __liburcu_packages | list }}"
-  when: liburcu_packages is not defined
+  include_vars: "{{ item }}"
+  with_first_found:
+    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
+    - "{{ ansible_distribution }}.yml"
+    - "{{ ansible_os_family }}.yml"
 
 # Setup/install tasks.
 - include: setup-RedHat.yml
-  when: ansible_os_family == 'RedHat'
+  when: ansible_os_family in ['RedHat', 'Rocky']
 
 - include: setup-Debian.yml
   when: ansible_os_family == 'Debian'

diff --git a/automation/ansible/roles/liburcu/vars/Alpine.yml b/automation/ansible/roles/liburcu/vars/Alpine.yml
index c597f602aab49da16724427d9cf9bf0f224de39a..289ab9be0a73fbfb50780e4ce7cadc168326d9bc 100644 (file)
--- a/automation/ansible/roles/liburcu/vars/Alpine.yml
+++ b/automation/ansible/roles/liburcu/vars/Alpine.yml
@@ -1,2 +1,2 @@
 ---
-__liburcu_packages: []
+liburcu_packages: []

diff --git a/automation/ansible/roles/liburcu/vars/Debian.yml b/automation/ansible/roles/liburcu/vars/Debian.yml
index c597f602aab49da16724427d9cf9bf0f224de39a..289ab9be0a73fbfb50780e4ce7cadc168326d9bc 100644 (file)
--- a/automation/ansible/roles/liburcu/vars/Debian.yml
+++ b/automation/ansible/roles/liburcu/vars/Debian.yml
@@ -1,2 +1,2 @@
 ---
-__liburcu_packages: []
+liburcu_packages: []

diff --git a/automation/ansible/roles/liburcu/vars/RedHat.yml b/automation/ansible/roles/liburcu/vars/RedHat.yml
index c597f602aab49da16724427d9cf9bf0f224de39a..289ab9be0a73fbfb50780e4ce7cadc168326d9bc 100644 (file)
--- a/automation/ansible/roles/liburcu/vars/RedHat.yml
+++ b/automation/ansible/roles/liburcu/vars/RedHat.yml
@@ -1,2 +1,2 @@
 ---
-__liburcu_packages: []
+liburcu_packages: []

diff --git a/automation/ansible/roles/liburcu/vars/Rocky.yml b/automation/ansible/roles/liburcu/vars/Rocky.yml
new file mode 120000 (symlink)
index 0000000..f802000
--- /dev/null
+++ b/automation/ansible/roles/liburcu/vars/Rocky.yml
@@ -0,0 +1 @@
+RedHat.yml
\ No newline at end of file

diff --git a/automation/ansible/roles/liburcu/vars/Suse.yml b/automation/ansible/roles/liburcu/vars/Suse.yml
index c597f602aab49da16724427d9cf9bf0f224de39a..289ab9be0a73fbfb50780e4ce7cadc168326d9bc 100644 (file)
--- a/automation/ansible/roles/liburcu/vars/Suse.yml
+++ b/automation/ansible/roles/liburcu/vars/Suse.yml
@@ -1,2 +1,2 @@
 ---
-__liburcu_packages: []
+liburcu_packages: []

diff --git a/automation/ansible/roles/lttng-tools/tasks/main.yml b/automation/ansible/roles/lttng-tools/tasks/main.yml
index 291f5b39c5ff540388b6ac83ef35f121d7696b80..cd37dff67394b7b1737579ff33e2d12f9395a318 100644 (file)
--- a/automation/ansible/roles/lttng-tools/tasks/main.yml
+++ b/automation/ansible/roles/lttng-tools/tasks/main.yml
@@ -1,23 +1,15 @@
 ---
 # Include variables and define needed variables.
 - name: Include OS-specific variables.
-  include_vars: "{{ ansible_os_family }}.yml"
-
-- name: Define lttng_tools_packages.
-  set_fact:
-    lttng_tools_packages: "{{ __lttng_tools_packages | list }}"
-  when: lttng_tools_packages is not defined
-
-- name: Define lttng_tools_packages_no_recommends.
-  set_fact:
-    lttng_tools_packages_no_recommends: "{{ __lttng_tools_packages_no_recommends | list }}"
-  when:
-    - lttng_tools_packages_no_recommends is not defined
-    - ansible_os_family == 'Debian' or ansible_os_family == 'Suse'
+  include_vars: "{{ item }}"
+  with_first_found:
+    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
+    - "{{ ansible_distribution }}.yml"
+    - "{{ ansible_os_family }}.yml"
 
 # Setup/install tasks.
 - include: setup-RedHat.yml
-  when: ansible_os_family == 'RedHat'
+  when: ansible_os_family in ['RedHat', 'Rocky']
 
 - include: setup-Debian.yml
   when: ansible_os_family == 'Debian'

diff --git a/automation/ansible/roles/lttng-tools/vars/Alpine.yml b/automation/ansible/roles/lttng-tools/vars/Alpine.yml
index 410e912250c7d9128f38f7deda8065108d6daeed..10a5a1ae45c543d2e4de5ca39d590bb6722ca6d7 100644 (file)
--- a/automation/ansible/roles/lttng-tools/vars/Alpine.yml
+++ b/automation/ansible/roles/lttng-tools/vars/Alpine.yml
@@ -1,7 +1,7 @@
 ---
-__lttng_tools_packages:
-  - popt-dev
-  - libxml2-dev
-  - bash-completion
+lttng_tools_packages:
   - asciidoc
+  - bash-completion
+  - libxml2-dev
+  - popt-dev
   - xmlto

diff --git a/automation/ansible/roles/lttng-tools/vars/Debian.yml b/automation/ansible/roles/lttng-tools/vars/Debian.yml
index 21b47d0397e6d3d09d30b185b6f9a10d0a8e8d87..5ef484fafdc79a94739c2955d6fb5b9c18ad62a1 100644 (file)
--- a/automation/ansible/roles/lttng-tools/vars/Debian.yml
+++ b/automation/ansible/roles/lttng-tools/vars/Debian.yml
@@ -1,10 +1,10 @@
 ---
-__lttng_tools_packages:
+lttng_tools_packages:
+  - bash-completion
+  - libmsgpack-dev
   - libpopt-dev
   - libxml2-dev
-  - libmsgpack-dev
-  - bash-completion
 
-__lttng_tools_packages_no_recommends:
+lttng_tools_packages_no_recommends:
   - asciidoc
   - xmlto

diff --git a/automation/ansible/roles/lttng-tools/vars/RedHat.yml b/automation/ansible/roles/lttng-tools/vars/RedHat.yml
index c22ac55c0444fd09f67312848012fd0bc772fe47..2f80ef9c9a95e4cd696919e183c834acce8579a2 100644 (file)
--- a/automation/ansible/roles/lttng-tools/vars/RedHat.yml
+++ b/automation/ansible/roles/lttng-tools/vars/RedHat.yml
@@ -1,7 +1,7 @@
 ---
-__lttng_tools_packages:
-  - popt-devel
-  - libxml2-devel
-  - bash-completion
+lttng_tools_packages:
   - asciidoc
+  - bash-completion
+  - libxml2-devel
+  - popt-devel
   - xmlto

diff --git a/automation/ansible/roles/lttng-tools/vars/Rocky.yml b/automation/ansible/roles/lttng-tools/vars/Rocky.yml
new file mode 120000 (symlink)
index 0000000..f802000
--- /dev/null
+++ b/automation/ansible/roles/lttng-tools/vars/Rocky.yml
@@ -0,0 +1 @@
+RedHat.yml
\ No newline at end of file

diff --git a/automation/ansible/roles/lttng-tools/vars/Suse.yml b/automation/ansible/roles/lttng-tools/vars/Suse.yml
index e08e01dddc6e539ff6fa7efe3bf65383008fdfbd..b41902c51a97fcb3a37060b9df4a98ccff998bc3 100644 (file)
--- a/automation/ansible/roles/lttng-tools/vars/Suse.yml
+++ b/automation/ansible/roles/lttng-tools/vars/Suse.yml
@@ -1,9 +1,9 @@
 ---
-__lttng_tools_packages:
-  - popt-devel
-  - libxml2-devel
+lttng_tools_packages:
   - bash-completion
+  - libxml2-devel
+  - popt-devel
 
-__lttng_tools_packages_no_recommends:
+lttng_tools_packages_no_recommends:
   - asciidoc
   - xmlto

diff --git a/automation/ansible/roles/lttng-ust/tasks/main.yml b/automation/ansible/roles/lttng-ust/tasks/main.yml
index 38990331cfb9f733215a30eb89ab2912d1e6b470..cd37dff67394b7b1737579ff33e2d12f9395a318 100644 (file)
--- a/automation/ansible/roles/lttng-ust/tasks/main.yml
+++ b/automation/ansible/roles/lttng-ust/tasks/main.yml
@@ -1,16 +1,15 @@
 ---
 # Include variables and define needed variables.
 - name: Include OS-specific variables.
-  include_vars: "{{ ansible_os_family }}.yml"
-
-- name: Define lttng_ust_packages.
-  set_fact:
-    lttng_ust_packages: "{{ __lttng_ust_packages | list }}"
-  when: lttng_ust_packages is not defined
+  include_vars: "{{ item }}"
+  with_first_found:
+    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
+    - "{{ ansible_distribution }}.yml"
+    - "{{ ansible_os_family }}.yml"
 
 # Setup/install tasks.
 - include: setup-RedHat.yml
-  when: ansible_os_family == 'RedHat'
+  when: ansible_os_family in ['RedHat', 'Rocky']
 
 - include: setup-Debian.yml
   when: ansible_os_family == 'Debian'

diff --git a/automation/ansible/roles/lttng-ust/vars/Alpine.yml b/automation/ansible/roles/lttng-ust/vars/Alpine.yml
index 35875f6c889c7c5613bd8957f358506468de693d..9f44ecd89b828d82465b299de9afbf41696cd2a7 100644 (file)
--- a/automation/ansible/roles/lttng-ust/vars/Alpine.yml
+++ b/automation/ansible/roles/lttng-ust/vars/Alpine.yml
@@ -1,7 +1,7 @@
 ---
-__lttng_ust_packages:
-  - util-linux-dev
-  - texinfo
-  - python3
+lttng_ust_packages:
 #  - liblog4j1.2-java
   - numactl-dev
+  - python3
+  - texinfo
+  - util-linux-dev

diff --git a/automation/ansible/roles/lttng-ust/vars/Debian.yml b/automation/ansible/roles/lttng-ust/vars/Debian.yml
index e6f3b9a5f51587a6eb8d54014a1ff4841f374c26..2b8ce35f0c2708211482ef8365380bc5a3174009 100644 (file)
--- a/automation/ansible/roles/lttng-ust/vars/Debian.yml
+++ b/automation/ansible/roles/lttng-ust/vars/Debian.yml
@@ -1,8 +1,8 @@
 ---
-__lttng_ust_packages:
-  - uuid-dev
-  - texinfo
-  - python3
+lttng_ust_packages:
   - liblog4j1.2-java
   - liblog4j2-java
   - libnuma-dev
+  - python3
+  - texinfo
+  - uuid-dev

diff --git a/automation/ansible/roles/lttng-ust/vars/RedHat.yml b/automation/ansible/roles/lttng-ust/vars/RedHat.yml
index b85543d8c0b3da5850babaff98c31d89f7b7ee8e..9c236dd16f0d2ca58516574e56532ae178c425b6 100644 (file)
--- a/automation/ansible/roles/lttng-ust/vars/RedHat.yml
+++ b/automation/ansible/roles/lttng-ust/vars/RedHat.yml
@@ -1,6 +1,6 @@
 ---
-__lttng_ust_packages:
-  - libuuid-devel
-#  - texinfo
+lttng_ust_packages:
 #  - liblog4j1.2-java
+  - libuuid-devel
   - numactl-devel
+#  - texinfo

diff --git a/automation/ansible/roles/lttng-ust/vars/Rocky.yml b/automation/ansible/roles/lttng-ust/vars/Rocky.yml
new file mode 120000 (symlink)
index 0000000..f802000
--- /dev/null
+++ b/automation/ansible/roles/lttng-ust/vars/Rocky.yml
@@ -0,0 +1 @@
+RedHat.yml
\ No newline at end of file

diff --git a/automation/ansible/roles/lttng-ust/vars/Suse.yml b/automation/ansible/roles/lttng-ust/vars/Suse.yml
index 64d2cf0419239df5af7420399a4aa1aa079525c1..d3ad3a072f4cd61ed5c2b8d4fea74cc547374ba5 100644 (file)
--- a/automation/ansible/roles/lttng-ust/vars/Suse.yml
+++ b/automation/ansible/roles/lttng-ust/vars/Suse.yml
@@ -1,7 +1,7 @@
 ---
-__lttng_ust_packages:
+lttng_ust_packages:
+  - libnuma-devel
   - libuuid-devel
-  - texinfo
-  - python3
   - log4j
-  - libnuma-devel
+  - python3
+  - texinfo

diff --git a/automation/ansible/site.yml b/automation/ansible/site.yml
index 20fc9c562f7bb3acef0d382a10f522f5b747eabc..b75656f2987103ca254baa5ce8dc4ecc2c6cc171 100644 (file)
--- a/automation/ansible/site.yml
+++ b/automation/ansible/site.yml
@@ -8,4 +8,4 @@
 - import_playbook: node_amd64.yml
 - import_playbook: node_standalone.yml
 - import_playbook: node_sles.yml
-- import_playbook: node_el8.yml
+- import_playbook: node_el.yml