From 56ea897ebd6705926652675fb73458701ca9ecbb Mon Sep 17 00:00:00 2001 From: David Galloway Date: Mon, 30 Jul 2018 12:40:01 -0400 Subject: [PATCH] common/testnode: Support skipping entitlements & packages `skip_entitlements` and `skip_packaging` will be set to true in the Ansible inventory for OVH nodes Signed-off-by: David Galloway --- roles/common/tasks/yum_systems.yml | 4 +++- roles/testnode/tasks/yum_systems.yml | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/roles/common/tasks/yum_systems.yml b/roles/common/tasks/yum_systems.yml index 3ef2b3b..64056b3 100644 --- a/roles/common/tasks/yum_systems.yml +++ b/roles/common/tasks/yum_systems.yml @@ -43,10 +43,12 @@ when: ansible_distribution == 'Fedora' and ansible_distribution_major_version|int >= 22 # configure Red Hat entitlements with subscription-manager +# skip_entitlements=true on OVH testnodes - import_tasks: rhel-entitlements.yml when: ansible_distribution == 'RedHat' and - beta_distro == false + beta_distro == false and + skip_entitlements|default(false)|bool != true tags: - entitlements diff --git a/roles/testnode/tasks/yum_systems.yml b/roles/testnode/tasks/yum_systems.yml index 4c18bd5..f52e701 100644 --- a/roles/testnode/tasks/yum_systems.yml +++ b/roles/testnode/tasks/yum_systems.yml @@ -59,8 +59,17 @@ tags: - repos +# skip_packaging=true set in group_vars for OVH testnodes. We still want these +# tasks to run on CentOS though so we set it back to false here. +- set_fact: + skip_packaging: false + when: ansible_distribution != "RedHat" + tags: + - packages + - name: Perform package related tasks. import_tasks: yum/packages.yml + when: skip_packaging|default(false)|bool != true tags: - packages -- 2.39.5