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

deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml

@@ -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
+             module[mandatory], stream[mandatory], distribution_version[mandatory] and profile[optional].
-             is not specified 'common' will be used instead.
+             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

deployment/undercloud/undercloud-upgrade.yaml

@@ -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
+             module[mandatory], stream[mandatory], distribution_version[mandatory] and profile[optional].
-             is not specified 'common' will be used instead.
+             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:

environments/lifecycle/undercloud-upgrade-prepare.yaml

@@ -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'}]

environments/lifecycle/update-prepare.yaml

@@ -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'}]

environments/lifecycle/upgrade-prepare.yaml

@@ -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'}]

releasenotes/releasenotes/notes/dnf-streams-interface-c7191173efb7b139.yaml

@@ -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.