From b58345d7fabb8a06e08b3bb81e4b7bef553021cd Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Fri, 11 Sep 2020 09:17:33 -0600 Subject: [PATCH] Add release version package Currently this is only used downstream, however there is a version package that can allow us to ensure specific package requirements are met. We can likely add this to the upstream via a tripleo-version or something to that efffect but currently this does not exist. So this change adds a task to ensure that we have the latest version of this version package at deploy time. Change-Id: I5fd88c8e2fae811e854eb0dfb462fae8d1ad8f0d --- .../roles/tripleo_bootstrap/defaults/main.yml | 2 ++ tripleo_ansible/roles/tripleo_bootstrap/tasks/main.yml | 10 ++++++++++ .../roles/tripleo_bootstrap/vars/redhat-8.yml | 3 +++ 3 files changed, 15 insertions(+) diff --git a/tripleo_ansible/roles/tripleo_bootstrap/defaults/main.yml b/tripleo_ansible/roles/tripleo_bootstrap/defaults/main.yml index 5c970c373..d9790f068 100644 --- a/tripleo_ansible/roles/tripleo_bootstrap/defaults/main.yml +++ b/tripleo_ansible/roles/tripleo_bootstrap/defaults/main.yml @@ -20,6 +20,8 @@ # List of packages that are requred to bootstrap TripleO. tripleo_bootstrap_packages_bootstrap: "{{ _tripleo_bootstrap_packages_bootstrap | default([]) }}" +tripleo_bootstrap_release_version_package: "{{ _tripleo_bootstrap_release_version_package | default([]) }}" + # List of packages that are required for legacy networking to function. # NOTE: We are using 'network' service provided by 'network-scripts' (initscripts) # which deprecated in recent releases but os-net-config doesn't support yet diff --git a/tripleo_ansible/roles/tripleo_bootstrap/tasks/main.yml b/tripleo_ansible/roles/tripleo_bootstrap/tasks/main.yml index 068e7eb58..ec01cd68c 100644 --- a/tripleo_ansible/roles/tripleo_bootstrap/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo_bootstrap/tasks/main.yml @@ -32,6 +32,16 @@ tags: - always +# Currently only supported on RHEL as tripleo does not have a version package +- name: Deploy release version package + become: true + package: + name: "{{ tripleo_bootstrap_release_version_package }}" + state: present + when: + - (ansible_distribution | lower) == 'redhat' + - (tripleo_bootstrao_release_version_package |list | length) > 0 + - name: Deploy required packages to bootstrap TripleO become: true package: diff --git a/tripleo_ansible/roles/tripleo_bootstrap/vars/redhat-8.yml b/tripleo_ansible/roles/tripleo_bootstrap/vars/redhat-8.yml index 295f7a3ea..f43327334 100644 --- a/tripleo_ansible/roles/tripleo_bootstrap/vars/redhat-8.yml +++ b/tripleo_ansible/roles/tripleo_bootstrap/vars/redhat-8.yml @@ -31,3 +31,6 @@ _tripleo_bootstrap_legacy_network_packages: - network-scripts tripleo_bootstrap_network_service: NetworkManager + +_tripleo_bootstrap_release_version_package: + - rhosp-version