openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Make DnfStreams support RoleParameters"

This commit is contained in:
Zuul 2021-02-09 15:57:05 +00:00 committed by Gerrit Code Review
parent b7b9af6f80 69357c3a64
commit f68a949987
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
View File

@ -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
@ -242,7 +255,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
@ -344,7 +357,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