summaryrefslogtreecommitdiffstats
path: root/ansible/roles
diff options
context:
space:
mode:
authorBartek Grzybowski <b.grzybowski@partner.samsung.com>2021-10-01 09:59:31 +0000
committerGerrit Code Review <gerrit@onap.org>2021-10-01 09:59:31 +0000
commit6df828a11cf31250d62b2303251c8f32059fe4fe (patch)
treee8d8a8a63e83f12555252d6f3f76f36fc2339f8f /ansible/roles
parenta94408a888e32c83d24b2b3e697fe9906afb3eb9 (diff)
parent632891dd505db333ac3ee401eb9eb1a9431d5d60 (diff)
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
Diffstat (limited to 'ansible/roles')
-rw-r--r--ansible/roles/certificates/molecule/default/molecule.yml4
-rw-r--r--ansible/roles/chartmuseum/molecule/default/molecule.yml2
-rw-r--r--ansible/roles/chrony/molecule/default/molecule.yml4
-rw-r--r--ansible/roles/chrony/molecule/external_time_source/molecule.yml4
-rw-r--r--ansible/roles/dns/molecule/default/molecule.yml2
-rw-r--r--ansible/roles/docker/molecule/default/molecule.yml2
-rw-r--r--ansible/roles/k8s-persistent-volume/molecule/default/molecule.yml2
-rw-r--r--ansible/roles/kubectl/molecule/default/molecule.yml2
-rw-r--r--ansible/roles/nexus/molecule/default/molecule.yml2
-rw-r--r--ansible/roles/nfs/molecule/default/molecule.yml4
-rw-r--r--ansible/roles/nginx/molecule/default/molecule.yml2
-rwxr-xr-xansible/roles/package-repository-check/molecule/default/molecule.yml4
-rw-r--r--ansible/roles/package-repository/tasks/main.yml6
-rw-r--r--ansible/roles/resource-data/molecule/default/molecule.yml4
-rw-r--r--ansible/roles/rke/molecule/default/molecule.yml4
-rw-r--r--ansible/roles/rke/molecule/etcd_storage/molecule.yml4
-rw-r--r--ansible/roles/vncserver/molecule/default/molecule.yml2
17 files changed, 29 insertions, 25 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: