Merge changes from topic "rhel79-upgrade"

* changes:
  [DOC] Update Rhel/Centos version in docs to 7.9
  [ANSIBLE] Disable DNS management in Network Manager only if it's installed
  [CICDANSIBLE] Update heat template "image_name" parameter description
  [MOLECULE] Upgrade roles tests image to Centos7.9
  [MOLECULE] Upgrade playbook tests image to Centos7.9
  [BUILD] Run Centos7.9 docker image for rpm download

27 files changed, 54 insertions, 50 deletions

diff --git a/ansible/roles/certificates/molecule/default/molecule.yml b/ansible/roles/certificates/molecule/default/molecule.yml
index 98db057b..2672d5c9 100644
--- a/ansible/roles/certificates/molecule/default/molecule.yml
+++ b/ansible/roles/certificates/molecule/default/molecule.yml
@@ -10,7 +10,7 @@ lint: |
   flake8
 platforms:
   - name: infrastructure-server
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     command: ${MOLECULE_DOCKER_COMMAND:-""}
@@ -18,7 +18,7 @@ platforms:
       - infrastructure
 
   - name: kubernetes-node-1
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     command: ${MOLECULE_DOCKER_COMMAND:-""}
diff --git a/ansible/roles/chartmuseum/molecule/default/molecule.yml b/ansible/roles/chartmuseum/molecule/default/molecule.yml
index 2b64ce94..6ef819f2 100644
--- a/ansible/roles/chartmuseum/molecule/default/molecule.yml
+++ b/ansible/roles/chartmuseum/molecule/default/molecule.yml
@@ -10,7 +10,7 @@ lint: |
   flake8
 platforms:
   - name: instance-chartmuseum
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: True
     privileged: true
     override_command: False
diff --git a/ansible/roles/chrony/molecule/default/molecule.yml b/ansible/roles/chrony/molecule/default/molecule.yml
index 78d6f32a..93d89f52 100644
--- a/ansible/roles/chrony/molecule/default/molecule.yml
+++ b/ansible/roles/chrony/molecule/default/molecule.yml
@@ -10,7 +10,7 @@ lint: |
   flake8
 platforms:
   - name: infra_host
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: True
     privileged: true
     volume_mounts:
@@ -19,7 +19,7 @@ platforms:
     groups:
       - infrastructure
   - name: node0
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: True
     privileged: true
     volume_mounts:
diff --git a/ansible/roles/chrony/molecule/external_time_source/molecule.yml b/ansible/roles/chrony/molecule/external_time_source/molecule.yml
index ac32f330..07810b86 100644
--- a/ansible/roles/chrony/molecule/external_time_source/molecule.yml
+++ b/ansible/roles/chrony/molecule/external_time_source/molecule.yml
@@ -10,7 +10,7 @@ lint: |
   flake8
 platforms:
   - name: infra_host
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: True
     privileged: true
     volume_mounts:
@@ -19,7 +19,7 @@ platforms:
     groups:
       - infrastructure
   - name: node0
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: True
     privileged: true
     volume_mounts:
diff --git a/ansible/roles/dns/molecule/default/molecule.yml b/ansible/roles/dns/molecule/default/molecule.yml
index a2d2c204..c3ed309a 100644
--- a/ansible/roles/dns/molecule/default/molecule.yml
+++ b/ansible/roles/dns/molecule/default/molecule.yml
@@ -10,7 +10,7 @@ lint: |
   flake8
 platforms:
   - name: infrastructure-server
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: True
     privileged: true
     override_command: False
diff --git a/ansible/roles/docker/molecule/default/molecule.yml b/ansible/roles/docker/molecule/default/molecule.yml
index adc7c543..7903a61d 100644
--- a/ansible/roles/docker/molecule/default/molecule.yml
+++ b/ansible/roles/docker/molecule/default/molecule.yml
@@ -10,7 +10,7 @@ lint: |
   flake8
 platforms:
   - name: infrastructure-server
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     command: ${MOLECULE_DOCKER_COMMAND:-""}
diff --git a/ansible/roles/k8s-persistent-volume/molecule/default/molecule.yml b/ansible/roles/k8s-persistent-volume/molecule/default/molecule.yml
index dbbf0d81..eb53f93f 100644
--- a/ansible/roles/k8s-persistent-volume/molecule/default/molecule.yml
+++ b/ansible/roles/k8s-persistent-volume/molecule/default/molecule.yml
@@ -10,7 +10,7 @@ lint: |
   flake8
 platforms:
   - name: infrastructure-k8s-persistent-volume
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     groups:
       - infrastructure
diff --git a/ansible/roles/kubectl/molecule/default/molecule.yml b/ansible/roles/kubectl/molecule/default/molecule.yml
index a91d5125..34faed14 100644
--- a/ansible/roles/kubectl/molecule/default/molecule.yml
+++ b/ansible/roles/kubectl/molecule/default/molecule.yml
@@ -10,7 +10,7 @@ lint: |
   flake8
 platforms:
   - name: infrastructure-server
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: True
     privileged: true
     override_command: False
diff --git a/ansible/roles/nexus/molecule/default/molecule.yml b/ansible/roles/nexus/molecule/default/molecule.yml
index c5145611..63ff4fa6 100644
--- a/ansible/roles/nexus/molecule/default/molecule.yml
+++ b/ansible/roles/nexus/molecule/default/molecule.yml
@@ -10,7 +10,7 @@ lint: |
   flake8
 platforms:
   - name: infrastructure-server
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     override_command: false
diff --git a/ansible/roles/nfs/molecule/default/molecule.yml b/ansible/roles/nfs/molecule/default/molecule.yml
index 121297e2..c7b991ef 100644
--- a/ansible/roles/nfs/molecule/default/molecule.yml
+++ b/ansible/roles/nfs/molecule/default/molecule.yml
@@ -10,7 +10,7 @@ lint: |
   flake8
 platforms:
   - name: kubernetes-node-1
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     command: ${MOLECULE_DOCKER_COMMAND:-""}
@@ -25,7 +25,7 @@ platforms:
       - /dockerdata-nfs
 
   - name: kubernetes-node-2
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     command: ${MOLECULE_DOCKER_COMMAND:-""}
diff --git a/ansible/roles/nginx/molecule/default/molecule.yml b/ansible/roles/nginx/molecule/default/molecule.yml
index c5145611..63ff4fa6 100644
--- a/ansible/roles/nginx/molecule/default/molecule.yml
+++ b/ansible/roles/nginx/molecule/default/molecule.yml
@@ -10,7 +10,7 @@ lint: |
   flake8
 platforms:
   - name: infrastructure-server
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     override_command: false
diff --git a/ansible/roles/package-repository-check/molecule/default/molecule.yml b/ansible/roles/package-repository-check/molecule/default/molecule.yml
index 78d6f32a..93d89f52 100755
--- a/ansible/roles/package-repository-check/molecule/default/molecule.yml
+++ b/ansible/roles/package-repository-check/molecule/default/molecule.yml
@@ -10,7 +10,7 @@ lint: |
   flake8
 platforms:
   - name: infra_host
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: True
     privileged: true
     volume_mounts:
@@ -19,7 +19,7 @@ platforms:
     groups:
       - infrastructure
   - name: node0
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: True
     privileged: true
     volume_mounts:
diff --git a/ansible/roles/package-repository/tasks/main.yml b/ansible/roles/package-repository/tasks/main.yml
index 763ee659..3ccce081 100644
--- a/ansible/roles/package-repository/tasks/main.yml
+++ b/ansible/roles/package-repository/tasks/main.yml
@@ -1,4 +1,8 @@
 ---
+- name: Get installed packages list
+  package_facts:
+    manager: "auto"
+
 - name: Disable DNS management in Network Manager
   ini_file:
     path: /etc/NetworkManager/NetworkManager.conf
@@ -11,7 +15,7 @@
     group: root
     mode: 0644
     backup: false
-  when: ansible_os_family == 'RedHat'
+  when: ansible_os_family == 'RedHat' and 'NetworkManager' in ansible_facts.packages
   notify:
     - Restart NetworkManager
 
diff --git a/ansible/roles/resource-data/molecule/default/molecule.yml b/ansible/roles/resource-data/molecule/default/molecule.yml
index 89e3888f..5711a7f1 100644
--- a/ansible/roles/resource-data/molecule/default/molecule.yml
+++ b/ansible/roles/resource-data/molecule/default/molecule.yml
@@ -11,7 +11,7 @@ lint: |
 platforms:
 
   - name: resource-host
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     command: ${MOLECULE_DOCKER_COMMAND:-""}
@@ -24,7 +24,7 @@ platforms:
       #  - ${HOME}/resource-data:/data:rw  # mount fs from host to get nfs exportfs task working
 
   - name: infrastructure-server
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     command: ${MOLECULE_DOCKER_COMMAND:-""}
diff --git a/ansible/roles/rke/molecule/default/molecule.yml b/ansible/roles/rke/molecule/default/molecule.yml
index 994d44fc..6f1aac24 100644
--- a/ansible/roles/rke/molecule/default/molecule.yml
+++ b/ansible/roles/rke/molecule/default/molecule.yml
@@ -10,7 +10,7 @@ lint: |
   flake8
 platforms:
   - name: infrastructure-server
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     override_command: false
@@ -20,7 +20,7 @@ platforms:
       - kubernetes-control-plane
       - kubernetes
   - name: kubernetes-node-1
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     override_command: false
diff --git a/ansible/roles/rke/molecule/etcd_storage/molecule.yml b/ansible/roles/rke/molecule/etcd_storage/molecule.yml
index 2f01df16..cfd169e2 100644
--- a/ansible/roles/rke/molecule/etcd_storage/molecule.yml
+++ b/ansible/roles/rke/molecule/etcd_storage/molecule.yml
@@ -10,7 +10,7 @@ lint: |
   flake8
 platforms:
   - name: infrastructure-server
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     override_command: false
@@ -20,7 +20,7 @@ platforms:
       - kubernetes-control-plane
       - kubernetes
   - name: kubernetes-node-1
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     override_command: false
diff --git a/ansible/roles/vncserver/molecule/default/molecule.yml b/ansible/roles/vncserver/molecule/default/molecule.yml
index 4486c00c..a4d2ad43 100644
--- a/ansible/roles/vncserver/molecule/default/molecule.yml
+++ b/ansible/roles/vncserver/molecule/default/molecule.yml
@@ -10,7 +10,7 @@ lint: |
   flake8
 platforms:
   - name: infrastructure-server
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: True
     privileged: true
     volumes:
diff --git a/ansible/test/images/docker/centos7/build.sh b/ansible/test/images/docker/centos7/build.sh
index dede5215..05d28c12 100755
--- a/ansible/test/images/docker/centos7/build.sh
+++ b/ansible/test/images/docker/centos7/build.sh
@@ -2,7 +2,7 @@
 
 #   COPYRIGHT NOTICE STARTS HERE
 
-#   Copyright 2018 © Samsung Electronics Co., Ltd.
+#   Copyright 2021 © Samsung Electronics Co., Ltd.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -19,5 +19,5 @@
 #   COPYRIGHT NOTICE ENDS HERE
 
 set -e
-TAG=${1:-centos7.6}
+TAG=${1:-centos7.9}
 docker build . -t molecule-centos:${TAG}
diff --git a/ansible/test/play-infrastructure/molecule/default/molecule.yml b/ansible/test/play-infrastructure/molecule/default/molecule.yml
index 6aea7a37..c39c8621 100644
--- a/ansible/test/play-infrastructure/molecule/default/molecule.yml
+++ b/ansible/test/play-infrastructure/molecule/default/molecule.yml
@@ -10,7 +10,7 @@ lint: |
   flake8
 platforms:
   - name: infrastructure-server
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     override_command: false
@@ -25,7 +25,7 @@ platforms:
     purge_networks: true
 
   - name: kubernetes-node-1
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     override_command: false
diff --git a/ansible/test/play-resources/molecule/default/molecule.yml b/ansible/test/play-resources/molecule/default/molecule.yml
index 5c7dbd54..eaa42bc9 100644
--- a/ansible/test/play-resources/molecule/default/molecule.yml
+++ b/ansible/test/play-resources/molecule/default/molecule.yml
@@ -10,7 +10,7 @@ lint: |
   flake8
 platforms:
   - name: resource-host
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     override_command: false
@@ -22,7 +22,7 @@ platforms:
       - name: resource-data
 
   - name: infrastructure-server
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     override_command: false
diff --git a/ansible/test/play-resources/molecule/nfs/molecule.yml b/ansible/test/play-resources/molecule/nfs/molecule.yml
index 25a14065..bb040a57 100644
--- a/ansible/test/play-resources/molecule/nfs/molecule.yml
+++ b/ansible/test/play-resources/molecule/nfs/molecule.yml
@@ -10,7 +10,7 @@ lint: |
   flake8
 platforms:
   - name: resource-host
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     override_command: false
@@ -23,7 +23,7 @@ platforms:
       - name: resource-data
 
   - name: infrastructure-server
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     override_command: false
diff --git a/ansible/test/play-rke/molecule/default/molecule.yml b/ansible/test/play-rke/molecule/default/molecule.yml
index 13fe96b9..39945a25 100644
--- a/ansible/test/play-rke/molecule/default/molecule.yml
+++ b/ansible/test/play-rke/molecule/default/molecule.yml
@@ -10,7 +10,7 @@ lint: |
   flake8
 platforms:
   - name: infrastructure-server
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     override_command: false
@@ -20,7 +20,7 @@ platforms:
       - kubernetes-control-plane
       - kubernetes
   - name: kubernetes-node-1
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     override_command: false
diff --git a/ansible/test/play-rke/molecule/helm3/molecule.yml b/ansible/test/play-rke/molecule/helm3/molecule.yml
index 13fe96b9..39945a25 100644
--- a/ansible/test/play-rke/molecule/helm3/molecule.yml
+++ b/ansible/test/play-rke/molecule/helm3/molecule.yml
@@ -10,7 +10,7 @@ lint: |
   flake8
 platforms:
   - name: infrastructure-server
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     override_command: false
@@ -20,7 +20,7 @@ platforms:
       - kubernetes-control-plane
       - kubernetes
   - name: kubernetes-node-1
-    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
+    image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9}
     pre_build_image: true
     privileged: true
     override_command: false
diff --git a/build/create_repo.sh b/build/create_repo.sh
index f2bde32d..51875172 100755
--- a/build/create_repo.sh
+++ b/build/create_repo.sh
@@ -57,7 +57,7 @@ set_environment () {
     ;;
     centos|rhel)
         distro_type="rhel"
-        docker_image="centos:centos7.6.1810"
+        docker_image="centos:centos7.9.2009"
         expected_dir="resources/pkg/rpm"
         container_name="${1}_repo${container_name_suffix}"
     ;;
diff --git a/docs/BuildGuide.rst b/docs/BuildGuide.rst
index 6c6463ae..15a265c2 100644
--- a/docs/BuildGuide.rst
+++ b/docs/BuildGuide.rst
@@ -7,16 +7,16 @@ Offline Installer Package Build Guide
 
 This document describes how to build offline installer packages. The build process should be triggered on a host with internet connectivity. It will retrieve all artifacts required for ONAP deployment based on both - static data list files and dynamically assembled ones. The host used for the procedure in this guide should be preferably a separate build server.
 
-Procedure was completely tested on RHEL 7.6 as it’s the default target installation platform, however with small adaptations it should be applicable also for other platforms.
-Some discrepancies when Centos 7.6 is used are described below as well.
+Procedure was completely tested on RHEL 7.9 as it’s the default target installation platform, however with small adaptations it should be applicable also for other platforms.
+Some discrepancies when Centos 7.9 is used are described below as well.
 
 
 Part 1. Prerequisites
 ---------------------
 
-We assume that procedure is executed on RHEL 7.6 server with \~300G disc space, 16G+ RAM and internet connectivity.
+We assume that procedure is executed on RHEL 7.9 server with \~300G disc space, 16G+ RAM and internet connectivity.
 
-Some additional software packages are required by ONAP Offline platform building tooling. In order to install them following repos have to be configured for RHEL 7.6 platform.
+Some additional software packages are required by ONAP Offline platform building tooling. In order to install them following repos have to be configured for RHEL 7.9 platform.
 
 
 
@@ -26,7 +26,7 @@ Some additional software packages are required by ONAP Offline platform building
 ::
 
     ############
-    # RHEL 7.6 #
+    # RHEL 7.9 #
     ############
 
     # Register server
@@ -46,7 +46,7 @@ Alternatively
 ::
 
    ##############
-   # Centos 7.6 #
+   # Centos 7.9 #
    ##############
 
    # required by custom docker version recommended by ONAP
diff --git a/docs/InstallGuide.rst b/docs/InstallGuide.rst
index 30f5c404..915dd6a6 100644
--- a/docs/InstallGuide.rst
+++ b/docs/InstallGuide.rst
@@ -48,14 +48,14 @@ Kubernetes cluster overview
 =================== ================== ==================== ============== ============ ===============
 KUBERNETES NODE     OS                 NETWORK              CPU            RAM          STORAGE
 =================== ================== ==================== ============== ============ ===============
-**infra-node**      RHEL/CentOS 7.6    ``10.8.8.100/24``    ``8 vCPUs``    ``8 GB``     ``100 GB``
-**kube-node1**      RHEL/CentOS 7.6    ``10.8.8.101/24``    ``16 vCPUs``   ``56+ GB``   ``100 GB``
-**kube-node2**      RHEL/CentOS 7.6    ``10.8.8.102/24``    ``16 vCPUs``   ``56+ GB``   ``100 GB``
-**kube-node3**      RHEL/CentOS 7.6    ``10.8.8.103/24``    ``16 vCPUs``   ``56+ GB``   ``100 GB``
+**infra-node**      RHEL/CentOS 7.9    ``10.8.8.100/24``    ``8 vCPUs``    ``8 GB``     ``100 GB``
+**kube-node1**      RHEL/CentOS 7.9    ``10.8.8.101/24``    ``16 vCPUs``   ``56+ GB``   ``100 GB``
+**kube-node2**      RHEL/CentOS 7.9    ``10.8.8.102/24``    ``16 vCPUs``   ``56+ GB``   ``100 GB``
+**kube-node3**      RHEL/CentOS 7.9    ``10.8.8.103/24``    ``16 vCPUs``   ``56+ GB``   ``100 GB``
 SUM                                                         ``56 vCPUs``   ``176+ GB``  ``400 GB``
 =========================================================== ============== ============ ===============
 
-As of now, the offline installer supports only **RHEL 7.x** and **CentOS 7.6** distributions, with at least *@core* and *@base* package groups installed including *Mandatory* and *Default* package sets. So, your VMs should be preinstalled with this operating system - the hypervisor and platform can be of your choosing.
+As of now, the offline installer supports only **RHEL 7.x** and **CentOS 7.9** distributions, with at least *@core* and *@base* package groups installed including *Mandatory* and *Default* package sets. So, your VMs should be preinstalled with this operating system - the hypervisor and platform can be of your choosing.
 
 We will expect from now on that you installed four VMs and they are connected to the shared network. All VMs must be reachable from *install-server* (below), which can be the hypervisor, *infra-node* or completely different host. But in either of these cases the *install-server* must be able to connect over ssh to all of these nodes.
 
diff --git a/tools/cicdansible/heat/installer.yaml b/tools/cicdansible/heat/installer.yaml
index 04f0debc..101c5263 100644
--- a/tools/cicdansible/heat/installer.yaml
+++ b/tools/cicdansible/heat/installer.yaml
@@ -29,7 +29,7 @@ parameters:
         description: "need to specify a valid flavor"
   image_name:
     label: "image name"
-    description: "name of the image from which to create all instances, should be rhel 7.6 or centos image"
+    description: "name of the image from which to create all instances, should be rhel/centos 7.9 image"
     type: string
     constraints:
       - custom_constraint: glance.image