From 2be083bf2e8335f09f7aafe21fc5014b771ca76c Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Mon, 8 Feb 2021 21:20:35 +0100 Subject: [PATCH] Make DnfStreams support RoleParameters This is useful in case the list of modules to enable is different for the various roles; for example CephStorage vs Compute Change-Id: Ib58b6152bc98002c048a4ae483454813c8298df9 Closes-Bug: #1915067 (cherry picked from commit 69357c3a6449b769b53e1b3a2ada75414d29d91c) (cherry picked from commit 0efeb96a3b183a88963ed064ccd5a866876e9ec7) --- .../tripleo-packages-baremetal-puppet.yaml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml index 4c09e0cc51..fee0a32954 100644 --- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml +++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml @@ -105,6 +105,19 @@ parameters: is not specified 'common' will be used instead. type: json +resources: + RoleParametersValue: + type: OS::Heat::Value + properties: + type: json + value: + map_replace: + - map_replace: + - dnf_module_list: DnfStreams + - values: {get_param: [RoleParameters]} + - values: + DnfStreams: {get_param: DnfStreams} + outputs: role_data: description: Role data for the TripleO package settings @@ -239,7 +252,7 @@ outputs: - {get_param: UpgradeInitCommonCommand} - name: Ensure DNF modules have the right stream vars: - dnf_module_list: {get_param: DnfStreams} + dnf_module_list: {get_attr: [RoleParametersValue, value, 'dnf_module_list']} dnf: name: "@{{ item.module }}:{{ item.stream }}/{{ item.profile|default('common') }}" state: present @@ -338,7 +351,7 @@ outputs: - not (skip_rhel_enforcement | bool) - name: Ensure DNF modules have the right stream vars: - dnf_module_list: {get_param: DnfStreams} + dnf_module_list: {get_attr: [RoleParametersValue, value, 'dnf_module_list']} dnf: name: "@{{ item.module }}:{{ item.stream }}/{{ item.profile|default('common') }}" state: present