openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix 'Ensure DNF modules have the right stream'"

Browse Source
This commit is contained in:
Zuul 2022-06-22 17:34:03 +00:00 committed by Gerrit Code Review
commit 189f4afe6a
6 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,8 +108,8 @@ parameters:
default: []
description: List of streams to be configured before updating packages. Each list
element contains a dictionary with the following values defined
module[mandatory], stream[mandatory] and profile[optional]. If the profile
is not specified 'common' will be used instead.
module[mandatory], stream[mandatory], distribution_version[mandatory] and profile[optional].
If the profile is not specified 'common' will be used instead.
type: json
tags:
- role_specific
@ -282,8 +282,9 @@ outputs:
state: present
loop: "{{ dnf_module_list|list }}"
when:
- ansible_facts['distribution_major_version'] is version('8', '>=')
- dnf_module_list|length > 0
- item.distribution_version is defined
- ansible_facts['distribution_major_version'] is version(item.distribution_version, '==')
- name: Ensure TripleO prerequisite packages are installed
package:
name:
@ -401,8 +402,9 @@ outputs:
loop: "{{ dnf_module_list|list }}"
when:
- step|int == 0
- ansible_facts['distribution_major_version'] is version('8', '>=')
- dnf_module_list|length > 0
- item.distribution_version is defined
- ansible_facts['distribution_major_version'] is version(item.distribution_version, '==')
- name: Check for existing yum.pid
stat: path=/run/yum.pid
register: yum_pid_file

7
deployment/undercloud/undercloud-upgrade.yaml
View File

@ -37,8 +37,8 @@ parameters:
default: []
description: List of streams to be configured before updating packages. Each list
element contains a dictionary with the following values defined
module[mandatory], stream[mandatory] and profile[optional]. If the profile
is not specified 'common' will be used instead.
module[mandatory], stream[mandatory], distribution_version[mandatory] and profile[optional].
If the profile is not specified 'common' will be used instead.
type: json
tags:
- role_specific
@ -72,8 +72,9 @@ outputs:
loop: "{{ dnf_module_list|list }}"
when:
- step|int == 0
- ansible_facts['distribution_major_version'] is version('8', '==')
- dnf_module_list|length > 0
- item.distribution_version is defined
- ansible_facts['distribution_major_version'] is version(item.distribution_version, '==')
- name: Clean up Nova containers
when: step|int == 0
block:

2
environments/lifecycle/undercloud-upgrade-prepare.yaml
View File

@ -5,4 +5,4 @@ resource_registry:
parameter_defaults:
UndercloudUpgrade: true
DnfStreams: [{'module':'container-tools', 'stream':'3.0'}]
DnfStreams: [{'module':'container-tools', 'stream':'3.0', 'distribution_version':'8'}]

2
environments/lifecycle/update-prepare.yaml
View File

@ -7,4 +7,4 @@ resource_registry:
parameter_defaults:
CephAnsiblePlaybook: default
DnfStreams: [{'module':'container-tools', 'stream':'3.0'}]
DnfStreams: [{'module':'container-tools', 'stream':'3.0', 'distribution_version':'8'}]

2
environments/lifecycle/upgrade-prepare.yaml
View File

@ -17,4 +17,4 @@ parameter_defaults:
UpgradeInitCommonCommand: |
#!/bin/bash
set -eu
DnfStreams: [{'module':'container-tools', 'stream':'3.0'}]
DnfStreams: [{'module':'container-tools', 'stream':'3.0', 'distribution_version':'8'}]

8
releasenotes/releasenotes/notes/dnf-streams-interface-c7191173efb7b139.yaml Normal file
View File

@ -0,0 +1,8 @@
---
other:
- |
Mandatory fields of DnfStreams parameter was extended with new field
'distribution_version' which specifies distribution version of the OS
to check against during enabled dnf streams check. DnfStreams parameter
defines list of dnf module streams to be configured before updating
packages both on undercloud and overcloud.