From ef6669a27d7b3e37fd86e9a291c45ce020ed8e7c Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Tue, 15 Sep 2020 14:49:58 -0500 Subject: [PATCH] Use the UBI8 image for testing This change converts our use of CentOS7/88 to UBI8, which should provide a better test environment which will match that of production for future releases of TripleO. While this image change will better match production clouds thanks in large part to TCIB, it will also remove our use of docker.io (dockerhub) which fraught with peril due to the ongoing API rate limits saga. Story: 2006061 Task: 34774 Change-Id: I067046e5fd4d56cd88712f553e25a61db60ced7f (cherry picked from commit c28dde74698c231d5e34838a4c2dc6a7e96e87cf) Signed-off-by: Kevin Carter --- _skeleton_role_/molecule/default/molecule.yml | 20 +++++-- bindep.txt | 3 ++ .../roles/aide/molecule/default/molecule.yml | 19 +++++-- .../molecule/default/prepare.yml | 4 +- .../login-defs/molecule/default/molecule.yml | 20 +++++-- .../test_deps/molecule/default/molecule.yml | 20 +++++-- .../roles/test_deps/tasks/main.yml | 3 +- .../molecule/default/molecule.yml | 20 +++++-- .../molecule/negative/molecule.yml | 19 +++++-- .../molecule/positive/molecule.yml | 19 +++++-- .../molecule/default/molecule.yml | 20 +++++-- .../molecule/default/molecule.yml | 16 ++++-- .../molecule/default/molecule.yml | 17 ++++-- .../molecule/default/molecule.yml | 16 ++++-- .../molecule/default/molecule.yml | 17 ++++-- .../molecule/default/molecule.yml | 19 +++++-- .../molecule/default/molecule.yml | 19 +++++-- .../defaults/main.yml | 2 +- .../molecule/default/molecule.yml | 19 +++++-- .../molecule/default/molecule.yml | 19 +++++-- .../molecule/default/playbook.yml | 6 +-- .../molecule/legacy_vars/playbook.yml | 6 +-- .../molecule/podman-rm-stopped/playbook.yml | 6 +-- .../molecule/addkey/molecule.yml | 19 +++++-- .../molecule/default/molecule.yml | 19 +++++-- .../molecule/keygen/molecule.yml | 19 +++++-- .../molecule/ansible_hieradata/molecule.yml | 21 +++++--- .../molecule/default/molecule.yml | 19 +++++-- .../molecule/hieradata_vars/molecule.yml | 20 ++++--- .../molecule/default/molecule.yml | 20 ++++--- .../molecule/default/verify.yml | 6 +-- .../molecule/default/molecule.yml | 25 ++++++--- .../molecule/default/molecule.yml | 2 - .../molecule/default/playbook.yml | 1 + .../molecule/default/molecule.yml | 19 +++++-- .../molecule/default/molecule.yml | 18 +++++-- .../molecule/default/prepare.yml | 6 ++- .../molecule/positive/molecule.yml | 21 +++++--- .../molecule/default/molecule.yml | 23 +++++--- .../molecule/external_upgrade/molecule.yml | 27 +++++++--- .../molecule/ffu/molecule.yml | 24 ++++++--- .../molecule/update/molecule.yml | 50 ++++++----------- .../molecule/default/molecule.yml | 19 +++++-- .../tripleo-ptp/molecule/default/molecule.yml | 25 +++++---- .../molecule/default/molecule.yml | 19 +++++-- .../molecule/create/molecule.yml | 19 +++++-- .../molecule/create/prepare.yml | 3 ++ .../molecule/default/molecule.yml | 19 +++++-- .../molecule/default/molecule.yml | 24 ++++++--- .../molecule/default/tests/test_default.py | 2 +- .../molecule/no_networks/molecule.yml | 19 ++++--- .../no_networks/tests/test_no_networks.py | 2 +- .../molecule/banners/molecule.yml | 25 ++++++--- .../molecule/default/molecule.yml | 25 ++++++--- .../tripleo-systemd-wrapper/defaults/main.yml | 2 +- .../molecule/default/molecule.yml | 24 ++++++--- .../molecule/default/playbook.yml | 2 +- .../templates/service_kill.j2 | 2 +- .../molecule/default/molecule.yml | 24 ++++++--- .../molecule/default/prepare.yml | 3 ++ .../molecule/default/molecule.yml | 42 ++++++++------- .../molecule/default/molecule.yml | 21 +++++--- .../molecule/default/prepare.yml | 3 ++ .../molecule/default/molecule.yml | 18 +++++-- .../molecule/default/molecule.yml | 19 +++++-- .../molecule/default/molecule.yml | 15 ++++-- .../molecule/default/molecule.yml | 13 +++-- .../molecule/default/molecule.yml | 21 +++++--- .../molecule/ffu/molecule.yml | 17 +++--- .../molecule/upgrade/molecule.yml | 36 +++---------- .../molecule/default/molecule.yml | 21 +++++--- .../molecule/default/molecule.yml | 13 +++-- .../roles/tuned/molecule/default/molecule.yml | 2 - .../tuned/molecule/isolated/molecule.yml | 2 - .../roles/tuned/tasks/tuned_config.yml | 2 + zuul.d/molecule.yaml | 53 ------------------- zuul.d/playbooks/pre.yml | 7 +++ 77 files changed, 828 insertions(+), 423 deletions(-) diff --git a/_skeleton_role_/molecule/default/molecule.yml b/_skeleton_role_/molecule/default/molecule.yml index eb3abfba6..b09d8ba14 100644 --- a/_skeleton_role_/molecule/default/molecule.yml +++ b/_skeleton_role_/molecule/default/molecule.yml @@ -5,11 +5,17 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -17,6 +23,12 @@ platforms: - host provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/bindep.txt b/bindep.txt index e94af23ec..97b373b5e 100644 --- a/bindep.txt +++ b/bindep.txt @@ -25,6 +25,9 @@ PyYAML [platform:rpm !platform:rhel-8 !platform:centos-8] python3-pyyaml [platform:rpm !platform:rhel-7 !platform:centos-7] python2-dnf [platform:fedora] +# RH Mechanisms +python-rhsm-certificates [platform:redhat] + # SELinux cent7 libselinux-python3 [platform:rpm !platform:rhel-8 !platform:centos-8] libsemanage-python3 [platform:redhat !platform:rhel-8 !platform:centos-8] diff --git a/tripleo_ansible/roles/aide/molecule/default/molecule.yml b/tripleo_ansible/roles/aide/molecule/default/molecule.yml index f7b26f791..ef1200188 100644 --- a/tripleo_ansible/roles/aide/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/aide/molecule/default/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -19,6 +24,12 @@ platforms: - host provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/backup-and-restore/molecule/default/prepare.yml b/tripleo_ansible/roles/backup-and-restore/molecule/default/prepare.yml index af50ba650..3abea45f6 100644 --- a/tripleo_ansible/roles/backup-and-restore/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/backup-and-restore/molecule/default/prepare.yml @@ -83,13 +83,13 @@ podman_image: name: "{{ item }}" with_items: - - centos:8 + - ubi:8 - mysql - name: Create a data container podman_container: name: "{{ item }}" - image: centos:8 + image: ubi:8 state: started command: sleep 1d with_items: diff --git a/tripleo_ansible/roles/login-defs/molecule/default/molecule.yml b/tripleo_ansible/roles/login-defs/molecule/default/molecule.yml index cb38a254d..7421a7267 100644 --- a/tripleo_ansible/roles/login-defs/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/login-defs/molecule/default/molecule.yml @@ -5,22 +5,32 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" ulimits: &ulimit - host - provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/test_deps/molecule/default/molecule.yml b/tripleo_ansible/roles/test_deps/molecule/default/molecule.yml index fd7e129fc..f433cdc49 100644 --- a/tripleo_ansible/roles/test_deps/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/test_deps/molecule/default/molecule.yml @@ -5,21 +5,31 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" ulimits: &ulimit - host - provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/test_deps/tasks/main.yml b/tripleo_ansible/roles/test_deps/tasks/main.yml index de1d0f13c..e451b67f5 100644 --- a/tripleo_ansible/roles/test_deps/tasks/main.yml +++ b/tripleo_ansible/roles/test_deps/tasks/main.yml @@ -44,7 +44,7 @@ block: - name: Fetch latest repo version uri: - url: https://trunk.rdoproject.org/{{ (ansible_distribution | lower) }}{{ ansible_distribution_major_version }}/current/delorean.repo + url: https://trunk.rdoproject.org/centos{{ ansible_distribution_major_version }}/current/delorean.repo return_content: true register: tripleo_packages @@ -73,6 +73,7 @@ package: name: "{{ test_deps_tripleo_packages }}" state: present + disable_gpg_check: true - name: List configured repos become: true diff --git a/tripleo_ansible/roles/test_package_action/molecule/default/molecule.yml b/tripleo_ansible/roles/test_package_action/molecule/default/molecule.yml index 1bc690e85..ef1200188 100644 --- a/tripleo_ansible/roles/test_package_action/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/test_package_action/molecule/default/molecule.yml @@ -5,21 +5,31 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" ulimits: &ulimit - host - provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/test_package_action/molecule/negative/molecule.yml b/tripleo_ansible/roles/test_package_action/molecule/negative/molecule.yml index f7b26f791..ef1200188 100644 --- a/tripleo_ansible/roles/test_package_action/molecule/negative/molecule.yml +++ b/tripleo_ansible/roles/test_package_action/molecule/negative/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -19,6 +24,12 @@ platforms: - host provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/test_package_action/molecule/positive/molecule.yml b/tripleo_ansible/roles/test_package_action/molecule/positive/molecule.yml index f7b26f791..ef1200188 100644 --- a/tripleo_ansible/roles/test_package_action/molecule/positive/molecule.yml +++ b/tripleo_ansible/roles/test_package_action/molecule/positive/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -19,6 +24,12 @@ platforms: - host provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo-cellv2/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-cellv2/molecule/default/molecule.yml index 1bc690e85..ef1200188 100644 --- a/tripleo_ansible/roles/tripleo-cellv2/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-cellv2/molecule/default/molecule.yml @@ -5,21 +5,31 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" ulimits: &ulimit - host - provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo-ceph-common/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-ceph-common/molecule/default/molecule.yml index 28d787b1e..4b1961fcf 100644 --- a/tripleo_ansible/roles/tripleo-ceph-common/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-ceph-common/molecule/default/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -23,6 +28,9 @@ provisioner: inventory: hosts: all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 vars: ansible_user: root log: true diff --git a/tripleo_ansible/roles/tripleo-ceph-run-ansible/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-ceph-run-ansible/molecule/default/molecule.yml index dd1715ad4..4b1961fcf 100644 --- a/tripleo_ansible/roles/tripleo-ceph-run-ansible/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-ceph-run-ansible/molecule/default/molecule.yml @@ -5,25 +5,32 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" ulimits: &ulimit - host - provisioner: name: ansible inventory: hosts: all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 vars: ansible_user: root log: true diff --git a/tripleo_ansible/roles/tripleo-ceph-uuid/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-ceph-uuid/molecule/default/molecule.yml index 28d787b1e..4b1961fcf 100644 --- a/tripleo_ansible/roles/tripleo-ceph-uuid/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-ceph-uuid/molecule/default/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -23,6 +28,9 @@ provisioner: inventory: hosts: all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 vars: ansible_user: root log: true diff --git a/tripleo_ansible/roles/tripleo-ceph-work-dir/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-ceph-work-dir/molecule/default/molecule.yml index dd1715ad4..4b1961fcf 100644 --- a/tripleo_ansible/roles/tripleo-ceph-work-dir/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-ceph-work-dir/molecule/default/molecule.yml @@ -5,25 +5,32 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" ulimits: &ulimit - host - provisioner: name: ansible inventory: hosts: all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 vars: ansible_user: root log: true diff --git a/tripleo_ansible/roles/tripleo-clients-install/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-clients-install/molecule/default/molecule.yml index f7b26f791..248e091dc 100644 --- a/tripleo_ansible/roles/tripleo-clients-install/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-clients-install/molecule/default/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -20,6 +25,12 @@ platforms: provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo-config/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-config/molecule/default/molecule.yml index 94950443f..7421a7267 100644 --- a/tripleo_ansible/roles/tripleo-config/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-config/molecule/default/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -20,6 +25,12 @@ platforms: provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo-container-image-build/defaults/main.yml b/tripleo_ansible/roles/tripleo-container-image-build/defaults/main.yml index 108bb5c9c..61784f566 100644 --- a/tripleo_ansible/roles/tripleo-container-image-build/defaults/main.yml +++ b/tripleo_ansible/roles/tripleo-container-image-build/defaults/main.yml @@ -22,7 +22,7 @@ tcib_path: "{{ lookup('env', 'HOME') }}" tcib_args: {} # String, required, 'item', implements https://docs.docker.com/engine/reference/builder/#from -tcib_from: "centos:8" +tcib_from: "ubi:8" # Dictionary, single level key:value pairs, optional, implements https://docs.docker.com/engine/reference/builder/#label tcib_labels: {} diff --git a/tripleo_ansible/roles/tripleo-container-image-build/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-container-image-build/molecule/default/molecule.yml index 94950443f..7421a7267 100644 --- a/tripleo_ansible/roles/tripleo-container-image-build/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-container-image-build/molecule/default/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -20,6 +25,12 @@ platforms: provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/default/molecule.yml index d2709963f..cd30b9e1e 100644 --- a/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/default/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -19,6 +24,12 @@ platforms: - host provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo-container-rm/molecule/default/playbook.yml index 384a047c8..be1b1528b 100644 --- a/tripleo_ansible/roles/tripleo-container-rm/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo-container-rm/molecule/default/playbook.yml @@ -21,6 +21,6 @@ roles: - role: tripleo-container-rm tripleo_containers_to_rm: - - podman-container1 - - podman-container2 - tripleo_container_cli: podman + - docker-container1 + - docker-container2 + tripleo_container_cli: docker diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/legacy_vars/playbook.yml b/tripleo_ansible/roles/tripleo-container-rm/molecule/legacy_vars/playbook.yml index 2d9d3bc3d..09b9b68be 100644 --- a/tripleo_ansible/roles/tripleo-container-rm/molecule/legacy_vars/playbook.yml +++ b/tripleo_ansible/roles/tripleo-container-rm/molecule/legacy_vars/playbook.yml @@ -20,7 +20,7 @@ hosts: all roles: - role: tripleo-container-rm - container_cli: podman + container_cli: docker containers_to_rm: - - podman-legacy-container1 - - podman-legacy-container2 + - docker-legacy-container1 + - docker-legacy-container2 diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/podman-rm-stopped/playbook.yml b/tripleo_ansible/roles/tripleo-container-rm/molecule/podman-rm-stopped/playbook.yml index 9ca7cb89f..4da6e6adf 100644 --- a/tripleo_ansible/roles/tripleo-container-rm/molecule/podman-rm-stopped/playbook.yml +++ b/tripleo_ansible/roles/tripleo-container-rm/molecule/podman-rm-stopped/playbook.yml @@ -20,7 +20,7 @@ hosts: all roles: - role: tripleo-container-rm - tripleo_container_cli: podman + tripleo_container_cli: docker tripleo_containers_to_rm: - - podman-container1 - - podman-container2 + - docker-container1 + - docker-container2 diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/molecule.yml b/tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/molecule.yml index 94950443f..95d81a298 100644 --- a/tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/molecule.yml +++ b/tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -19,6 +24,12 @@ platforms: - host provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-create-admin/molecule/default/molecule.yml index 94950443f..95d81a298 100644 --- a/tripleo_ansible/roles/tripleo-create-admin/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-create-admin/molecule/default/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -19,6 +24,12 @@ platforms: - host provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/molecule.yml b/tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/molecule.yml index 94950443f..95d81a298 100644 --- a/tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/molecule.yml +++ b/tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -19,6 +24,12 @@ platforms: - host provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo-hieradata/molecule/ansible_hieradata/molecule.yml b/tripleo_ansible/roles/tripleo-hieradata/molecule/ansible_hieradata/molecule.yml index e0dd60dc4..2d64bfbab 100644 --- a/tripleo_ansible/roles/tripleo-hieradata/molecule/ansible_hieradata/molecule.yml +++ b/tripleo_ansible/roles/tripleo-hieradata/molecule/ansible_hieradata/molecule.yml @@ -5,31 +5,38 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" ulimits: &ulimit - host - provisioner: name: ansible inventory: hosts: all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 vars: all_nodes_extra_map_data: {} cloud_domain: localdomain cloud_names: cloud_name_ctlplane: standalone.ctlplane.localdomain - container_cli: podman + container_cli: docker control_virtual_ip: 192.168.24.1 ctlplane_ip: 192.168.24.2 ctlplane_subnet_cidr: 24 @@ -250,7 +257,7 @@ provisioner: validate_ntp: true Standalone: hosts: - centos8: {} + ubi8: {} log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo-hieradata/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-hieradata/molecule/default/molecule.yml index 94950443f..95d81a298 100644 --- a/tripleo_ansible/roles/tripleo-hieradata/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-hieradata/molecule/default/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -19,6 +24,12 @@ platforms: - host provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/molecule.yml b/tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/molecule.yml index fc71cbd6a..2d64bfbab 100644 --- a/tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/molecule.yml +++ b/tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -23,12 +28,15 @@ provisioner: inventory: hosts: all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 vars: all_nodes_extra_map_data: {} cloud_domain: localdomain cloud_names: cloud_name_ctlplane: standalone.ctlplane.localdomain - container_cli: podman + container_cli: docker control_virtual_ip: 192.168.24.1 ctlplane_ip: 192.168.24.2 ctlplane_subnet_cidr: 24 @@ -249,7 +257,7 @@ provisioner: validate_ntp: true Standalone: hosts: - centos8: {} + ubi8: {} log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/molecule.yml index 352d5c844..e56902a8d 100644 --- a/tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -19,13 +24,16 @@ platforms: - host provisioner: - name: ansible log: true env: ANSIBLE_STDOUT_CALLBACK: yaml + name: ansible inventory: hosts: all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 vars: # use a tmp hosts path since /etc/hosts isn't writeable in the # molecule test containers @@ -49,7 +57,7 @@ provisioner: children: allovercloud: hosts: - centos8: + ubi8: hostname_resolve_network: ctlplane ctlplane_ip: 192.168.24.1 internal_api_ip: 172.17.0.1 diff --git a/tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/verify.yml b/tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/verify.yml index e657c1352..c5f0205f8 100644 --- a/tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/verify.yml +++ b/tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/verify.yml @@ -26,9 +26,9 @@ register: hosts_result check_mode: true loop: - - 192.168.24.1 centos8.localdomain centos8 - - 192.168.24.1 centos8.ctlplane.localdomain centos8.ctlplane - - 172.17.0.1 centos8.internalapi.localdomain centos8.internalapi + - 192.168.24.1 ubi8.localdomain ubi8 + - 192.168.24.1 ubi8.ctlplane.localdomain ubi8.ctlplane + - 172.17.0.1 ubi8.internalapi.localdomain ubi8.internalapi - name: slurp /tmp/hosts slurp: diff --git a/tripleo_ansible/roles/tripleo-image-serve/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-image-serve/molecule/default/molecule.yml index 59833242f..a9bea054e 100644 --- a/tripleo_ansible/roles/tripleo-image-serve/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-image-serve/molecule/default/molecule.yml @@ -5,16 +5,23 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools command: /sbin/init - capabilities: - - ALL + tmpfs: + - /run + - /tmp volumes: + - /run/udev:/run/udev:ro + - /sys/fs/cgroup:/sys/fs/cgroup:ro - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" @@ -23,6 +30,12 @@ platforms: - host provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/molecule.yml index 8b4a46688..03ace0696 100644 --- a/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/molecule.yml @@ -52,5 +52,3 @@ lint: verifier: name: testinfra - lint: - name: flake8 diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/playbook.yml index af1cdec5e..f5a92b45f 100644 --- a/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/playbook.yml @@ -20,6 +20,7 @@ become: true tasks: - name: Create openstack directory + become: true file: path: /etc/openstack state: directory diff --git a/tripleo_ansible/roles/tripleo-nova-image-cache/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-nova-image-cache/molecule/default/molecule.yml index 77bd0c08a..f433cdc49 100644 --- a/tripleo_ansible/roles/tripleo-nova-image-cache/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-nova-image-cache/molecule/default/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -19,6 +24,12 @@ platforms: - host provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/molecule.yml index 26b3800d9..d76f9902a 100644 --- a/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/molecule.yml @@ -5,19 +5,21 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile pkg_extras: python*-setuptools command: /sbin/init - capabilities: - - ALL volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro - /lib/modules:/lib/modules - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" @@ -26,6 +28,12 @@ platforms: - host provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/prepare.yml index f66847180..b702d1ff2 100644 --- a/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/prepare.yml @@ -23,7 +23,11 @@ roles: - role: test_deps post_tasks: - - name: Install ovs + - name: Create tripleo repos + command: tripleo-repos current-tripleo + become: true + - name: Install required packages + become: true package: name: - openvswitch diff --git a/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/molecule.yml b/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/molecule.yml index 2b7c379f9..46dcf188f 100644 --- a/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/molecule.yml +++ b/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/molecule.yml @@ -5,16 +5,17 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools - command: /sbin/init - capabilities: - - ALL + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" @@ -23,6 +24,12 @@ platforms: - host provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-packages/molecule/default/molecule.yml index 8647b09c2..a0c04b6cf 100644 --- a/tripleo_ansible/roles/tripleo-packages/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-packages/molecule/default/molecule.yml @@ -5,18 +5,23 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools command: /sbin/init - capabilities: - - ALL + tmpfs: + - /run + - /tmp volumes: - /dev:/dev - /lib/modules:/lib/modules - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" @@ -25,6 +30,12 @@ platforms: - host provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/external_upgrade/molecule.yml b/tripleo_ansible/roles/tripleo-packages/molecule/external_upgrade/molecule.yml index 487af8fc9..0fa6e375c 100644 --- a/tripleo_ansible/roles/tripleo-packages/molecule/external_upgrade/molecule.yml +++ b/tripleo_ansible/roles/tripleo-packages/molecule/external_upgrade/molecule.yml @@ -5,24 +5,37 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools command: /sbin/init - capabilities: - - ALL + tmpfs: + - /run + - /tmp volumes: - /dev:/dev - /lib/modules:/lib/modules - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw privileged: true + environment: &env + http_proxy: "{{ lookup('env', 'http_proxy') }}" + https_proxy: "{{ lookup('env', 'https_proxy') }}" ulimits: - host - provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/ffu/molecule.yml b/tripleo_ansible/roles/tripleo-packages/molecule/ffu/molecule.yml index ba852542e..48e0f9b91 100644 --- a/tripleo_ansible/roles/tripleo-packages/molecule/ffu/molecule.yml +++ b/tripleo_ansible/roles/tripleo-packages/molecule/ffu/molecule.yml @@ -5,18 +5,24 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools command: /sbin/init - capabilities: - - ALL + tmpfs: + - /run + - /tmp volumes: - /dev:/dev - /lib/modules:/lib/modules - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -25,6 +31,12 @@ platforms: provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/update/molecule.yml b/tripleo_ansible/roles/tripleo-packages/molecule/update/molecule.yml index 86cf02758..6335dfebf 100644 --- a/tripleo_ansible/roles/tripleo-packages/molecule/update/molecule.yml +++ b/tripleo_ansible/roles/tripleo-packages/molecule/update/molecule.yml @@ -5,57 +5,37 @@ driver: log: true platforms: - - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools command: >- /sbin/init && /bin/mkdir -p /var/run/dbus && /usr/bin/dbus-uuidgen > /var/lib/dbus/machine-id && /usr/bin/dbus-daemon --config-file=/usr/share/dbus-1/system.conf - - capabilities: - - ALL volumes: - /dev:/dev - /lib/modules:/lib/modules - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro privileged: true + environment: &env + http_proxy: "{{ lookup('env', 'http_proxy') }}" + https_proxy: "{{ lookup('env', 'https_proxy') }}" ulimits: &ulimit - host -# TODO(cloudnull): when RDO has centos8 repos this test node should be re-enabled. -# -# - name: centos8 -# hostname: centos8 -# image: centos:8 -# dockerfile: Dockerfile -# pkg_extras: python*-setuptools -# environment: -# http_proxy: "{{ lookup('env', 'http_proxy') }}" -# https_proxy: "{{ lookup('env', 'https_proxy') }}" -# command: >- -# /sbin/init && -# /bin/mkdir -p /var/run/dbus && -# /usr/bin/dbus-uuidgen > /var/lib/dbus/machine-id && -# /usr/bin/dbus-daemon --config-file=/usr/share/dbus-1/system.conf -# -# tmpfs: -# - /run -# - /tmp -# capabilities: -# - ALL -# volumes: -# - /dev:/dev -# - /lib/modules:/lib/modules -# privileged: true -# ulimits: *ulimit - provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo-persist/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-persist/molecule/default/molecule.yml index 77bd0c08a..f433cdc49 100644 --- a/tripleo_ansible/roles/tripleo-persist/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-persist/molecule/default/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -19,6 +24,12 @@ platforms: - host provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo-ptp/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-ptp/molecule/default/molecule.yml index c9821345c..be2135168 100644 --- a/tripleo_ansible/roles/tripleo-ptp/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-ptp/molecule/default/molecule.yml @@ -5,16 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools cronie rsyslog + pkg_extras: python*setuptools cronie rsyslog command: /sbin/init - capabilities: - - ALL volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" @@ -24,6 +26,12 @@ platforms: provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml @@ -37,10 +45,5 @@ scenario: - verify - destroy -lint: - enabled: false - verifier: name: testinfra - lint: - name: flake8 diff --git a/tripleo_ansible/roles/tripleo-redhat-enforce/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-redhat-enforce/molecule/default/molecule.yml index 9ffe25d2d..9b5c2b3fb 100644 --- a/tripleo_ansible/roles/tripleo-redhat-enforce/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-redhat-enforce/molecule/default/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -20,6 +25,12 @@ platforms: provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo-securetty/molecule/create/molecule.yml b/tripleo_ansible/roles/tripleo-securetty/molecule/create/molecule.yml index f7b26f791..ef1200188 100644 --- a/tripleo_ansible/roles/tripleo-securetty/molecule/create/molecule.yml +++ b/tripleo_ansible/roles/tripleo-securetty/molecule/create/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -19,6 +24,12 @@ platforms: - host provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo-securetty/molecule/create/prepare.yml b/tripleo_ansible/roles/tripleo-securetty/molecule/create/prepare.yml index ef85c3128..ce8b30adc 100644 --- a/tripleo_ansible/roles/tripleo-securetty/molecule/create/prepare.yml +++ b/tripleo_ansible/roles/tripleo-securetty/molecule/create/prepare.yml @@ -19,3 +19,6 @@ hosts: all roles: - role: test_deps + test_deps_extra_packages: + - cronie + - rsyslog diff --git a/tripleo_ansible/roles/tripleo-securetty/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-securetty/molecule/default/molecule.yml index f7b26f791..ef1200188 100644 --- a/tripleo_ansible/roles/tripleo-securetty/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-securetty/molecule/default/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -19,6 +24,12 @@ platforms: - host provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/default/molecule.yml index 27b70674f..4eb3a08d1 100644 --- a/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/default/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -23,17 +28,20 @@ provisioner: inventory: hosts: all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 children: allovercloud: hosts: - centos8: + ubi8: ansible_ssh_host_key_rsa_public: AAAATEST ctlplane_ip: 10.0.0.1 - ctlplane_hostname: centos8.ctlplane.localdomain + ctlplane_hostname: ubi8.ctlplane.localdomain internal_api_ip: 10.0.1.1 - internal_api_hostname: centos8.internalapi.localdomain + internal_api_hostname: ubi8.internalapi.localdomain management_ip: 10.0.0.1 # no management_hostname - canonical_hostname: centos8.localdomain + canonical_hostname: ubi8.localdomain tripleo_role_networks: [ctlplane, internal_api, management] log: true env: diff --git a/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/default/tests/test_default.py b/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/default/tests/test_default.py index b18567fd0..04478afff 100644 --- a/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/default/tests/test_default.py +++ b/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/default/tests/test_default.py @@ -25,7 +25,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def test_ssh_host_keys(host): expected = [ - '[10.0.0.1]*,[centos8.ctlplane.localdomain]*,[10.0.1.1]*,[centos8.internalapi.localdomain]*,[centos8.localdomain]*,[centos8]* ssh-rsa AAAATEST', + '[10.0.0.1]*,[ubi8.ctlplane.localdomain]*,[10.0.1.1]*,[ubi8.internalapi.localdomain]*,[ubi8.localdomain]*,[ubi8]* ssh-rsa AAAATEST', ] known_hosts = host.file("/etc/ssh/ssh_known_hosts").content_string for line in expected: diff --git a/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/no_networks/molecule.yml b/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/no_networks/molecule.yml index 7e9e68890..1a7bb554e 100644 --- a/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/no_networks/molecule.yml +++ b/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/no_networks/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -23,12 +28,14 @@ provisioner: inventory: hosts: all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 children: allovercloud: hosts: - centos8: + ubi8: ansible_ssh_host_key_rsa_public: AAAATEST - log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/no_networks/tests/test_no_networks.py b/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/no_networks/tests/test_no_networks.py index fb655054f..733e1d8ee 100644 --- a/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/no_networks/tests/test_no_networks.py +++ b/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/no_networks/tests/test_no_networks.py @@ -25,7 +25,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def test_ssh_host_keys(host): expected = [ - '[centos8]* ssh-rsa AAAATEST', + '[ubi8]* ssh-rsa AAAATEST', ] known_hosts = host.file("/etc/ssh/ssh_known_hosts").content_string for line in expected: diff --git a/tripleo_ansible/roles/tripleo-sshd/molecule/banners/molecule.yml b/tripleo_ansible/roles/tripleo-sshd/molecule/banners/molecule.yml index 59833242f..bab1ee0b1 100644 --- a/tripleo_ansible/roles/tripleo-sshd/molecule/banners/molecule.yml +++ b/tripleo_ansible/roles/tripleo-sshd/molecule/banners/molecule.yml @@ -5,16 +5,23 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools command: /sbin/init - capabilities: - - ALL + tmpfs: + - /run + - /tmp volumes: + - /run/udev:/run/udev:ro + - /sys/fs/cgroup:/sys/fs/cgroup:ro - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" @@ -24,6 +31,12 @@ platforms: provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo-sshd/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-sshd/molecule/default/molecule.yml index 59833242f..bab1ee0b1 100644 --- a/tripleo_ansible/roles/tripleo-sshd/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-sshd/molecule/default/molecule.yml @@ -5,16 +5,23 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools command: /sbin/init - capabilities: - - ALL + tmpfs: + - /run + - /tmp volumes: + - /run/udev:/run/udev:ro + - /sys/fs/cgroup:/sys/fs/cgroup:ro - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" @@ -24,6 +31,12 @@ platforms: provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper/defaults/main.yml b/tripleo_ansible/roles/tripleo-systemd-wrapper/defaults/main.yml index d7050d6e4..be5d29d0d 100644 --- a/tripleo_ansible/roles/tripleo-systemd-wrapper/defaults/main.yml +++ b/tripleo_ansible/roles/tripleo-systemd-wrapper/defaults/main.yml @@ -19,4 +19,4 @@ # All variables within this role should have a prefix of "tripleo_systemd_wrapper" tripleo_systemd_wrapper_debug: false -tripleo_systemd_wrapper_container_cli: podman +tripleo_systemd_wrapper_container_cli: docker diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/molecule.yml index 7a03560e5..6b1370e21 100644 --- a/tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/molecule.yml @@ -5,18 +5,22 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools - # needed for systemd stuff + pkg_extras: python*setuptools command: /sbin/init - capabilities: - - ALL + tmpfs: + - /run + - /tmp volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" @@ -26,6 +30,12 @@ platforms: provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/playbook.yml index bdccf5cb4..c9d97bc75 100644 --- a/tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/playbook.yml @@ -22,7 +22,7 @@ vars: tripleo_systemd_wrapper_cmd: "/usr/sbin/dnsmasq -k" tripleo_systemd_wrapper_config_bind_mount: "/var/lib/config-data/puppet-generated/neutron/etc/neutron:/etc/neutron:ro" - tripleo_systemd_wrapper_container_cli: podman + tripleo_systemd_wrapper_container_cli: docker tripleo_systemd_wrapper_image_name: "docker.io/tripleomaster/centos-binary-neutron-dhcp-agent:current-tripleo" tripleo_systemd_wrapper_service_dir: /var/lib/neutron tripleo_systemd_wrapper_service_kill_script: dnsmasq-kill diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service_kill.j2 b/tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service_kill.j2 index b06ff4828..eea64148b 100644 --- a/tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service_kill.j2 +++ b/tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service_kill.j2 @@ -25,7 +25,7 @@ else CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman" fi {% elif tripleo_systemd_wrapper_container_cli == 'docker' %} -{% if tripleo_systemd_wrapper_docker_additional_sockets and tripleo_systemd_wrapper_docker_additional_sockets|length > 0-%} +{% if tripleo_systemd_wrapper_docker_additional_sockets is defined and tripleo_systemd_wrapper_docker_additional_sockets | length > 0-%} export DOCKER_HOST=unix://{{ tripleo_systemd_wrapper_docker_additional_sockets[0] }} {% endif -%} CLI='docker' diff --git a/tripleo_ansible/roles/tripleo-timezone/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-timezone/molecule/default/molecule.yml index c9821345c..42af3c9ef 100644 --- a/tripleo_ansible/roles/tripleo-timezone/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-timezone/molecule/default/molecule.yml @@ -5,16 +5,22 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools cronie rsyslog + pkg_extras: python*setuptools command: /sbin/init - capabilities: - - ALL + tmpfs: + - /run + - /tmp volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:ro - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" @@ -24,6 +30,12 @@ platforms: provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo-timezone/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo-timezone/molecule/default/prepare.yml index ef85c3128..ce8b30adc 100644 --- a/tripleo_ansible/roles/tripleo-timezone/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/tripleo-timezone/molecule/default/prepare.yml @@ -19,3 +19,6 @@ hosts: all roles: - role: test_deps + test_deps_extra_packages: + - cronie + - rsyslog diff --git a/tripleo_ansible/roles/tripleo-transfer/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-transfer/molecule/default/molecule.yml index 8e6a35600..041ff4bd9 100644 --- a/tripleo_ansible/roles/tripleo-transfer/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-transfer/molecule/default/molecule.yml @@ -7,47 +7,51 @@ log: true platforms: - name: overcloud-controller-0 hostname: overcloud-controller-0 - image: centos:7 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python-setuptools - easy_install: - - pip - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" + pkg_extras: python*setuptools command: /sbin/init tmpfs: - /run - /tmp - capabilities: - - ALL # CENT7 requires all due to the age of the software volumes: - - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true + environment: + http_proxy: "{{ lookup('env', 'http_proxy') }}" + https_proxy: "{{ lookup('env', 'https_proxy') }}" - name: overcloud-controller-1 hostname: overcloud-controller-1 - image: centos:7 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python-setuptools - easy_install: - - pip - environment: - <<: *env + pkg_extras: python*setuptools command: /sbin/init tmpfs: - /run - /tmp - capabilities: - - ALL # CENT7 requires all due to the age of the software volumes: - - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true + environment: + http_proxy: "{{ lookup('env', 'http_proxy') }}" + https_proxy: "{{ lookup('env', 'https_proxy') }}" provisioner: name: ansible + inventory: + vars: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo-upgrade-hiera/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-upgrade-hiera/molecule/default/molecule.yml index 77bd0c08a..5ed6bd847 100644 --- a/tripleo_ansible/roles/tripleo-upgrade-hiera/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-upgrade-hiera/molecule/default/molecule.yml @@ -5,20 +5,29 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo-upgrade-hiera/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo-upgrade-hiera/molecule/default/prepare.yml index ef85c3128..ce8b30adc 100644 --- a/tripleo_ansible/roles/tripleo-upgrade-hiera/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/tripleo-upgrade-hiera/molecule/default/prepare.yml @@ -19,3 +19,6 @@ hosts: all roles: - role: test_deps + test_deps_extra_packages: + - cronie + - rsyslog diff --git a/tripleo_ansible/roles/tripleo-validations-package/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-validations-package/molecule/default/molecule.yml index 775e6e11e..dc1f91ae9 100644 --- a/tripleo_ansible/roles/tripleo-validations-package/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-validations-package/molecule/default/molecule.yml @@ -5,15 +5,19 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" @@ -21,6 +25,12 @@ platforms: - host provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/molecule.yml index 881204e02..372c89556 100644 --- a/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/molecule.yml @@ -5,19 +5,30 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo_lvmfilter/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_lvmfilter/molecule/default/molecule.yml index 881204e02..a58b7d737 100644 --- a/tripleo_ansible/roles/tripleo_lvmfilter/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_lvmfilter/molecule/default/molecule.yml @@ -5,16 +5,23 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" + ulimits: &ulimit + - host provisioner: name: ansible diff --git a/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/molecule.yml index 33812d1f3..242224c0b 100644 --- a/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" diff --git a/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/molecule.yml index 85ddde0e2..16fbb6410 100644 --- a/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/molecule.yml @@ -5,20 +5,29 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml b/tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml index 9ad4cfa0f..f2aa1e640 100644 --- a/tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml +++ b/tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml @@ -5,24 +5,23 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools - command: /sbin/init - capabilities: - - ALL + pkg_extras: python*setuptools volumes: - /dev:/dev - /lib/modules:/lib/modules - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host provisioner: name: ansible diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/molecule.yml b/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/molecule.yml index 2833b109f..dcf4c877e 100644 --- a/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/molecule.yml +++ b/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/molecule.yml @@ -5,20 +5,22 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile pkg_extras: python-setuptools openvswitch numactl-libs* unbound-libs* easy_install: - pip command: /sbin/init - capabilities: - - ALL volumes: - /dev:/dev - /lib/modules:/lib/modules - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" @@ -26,30 +28,6 @@ platforms: ulimits: &ulimit - host - -# TODO(cloudnull): when RDO has centos8 repos this test node should be re-enabled. -# -# - name: centos8 -# hostname: centos8 -# image: centos:8 -# dockerfile: Dockerfile -# pkg_extras: python*-setuptools openvswitch 'dnf-command(download)' unbound-libs* -# environment: -# http_proxy: "{{ lookup('env', 'http_proxy') }}" -# https_proxy: "{{ lookup('env', 'https_proxy') }}" -# command: /sbin/init -# -# tmpfs: -# - /run -# - /tmp -# capabilities: -# - ALL -# volumes: -# - /dev:/dev -# - /lib/modules:/lib/modules -# privileged: true -# ulimits: *ulimit - provisioner: name: ansible log: true diff --git a/tripleo_ansible/roles/tripleo_provision_mcelog/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_provision_mcelog/molecule/default/molecule.yml index 9ffe25d2d..c5ba7c2a6 100644 --- a/tripleo_ansible/roles/tripleo_provision_mcelog/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_provision_mcelog/molecule/default/molecule.yml @@ -5,20 +5,29 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - ulimits: &ulimit - - host provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/molecule.yml index 9ffe25d2d..6ea4949be 100644 --- a/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" diff --git a/tripleo_ansible/roles/tuned/molecule/default/molecule.yml b/tripleo_ansible/roles/tuned/molecule/default/molecule.yml index 4237a6801..d499d5a85 100644 --- a/tripleo_ansible/roles/tuned/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tuned/molecule/default/molecule.yml @@ -49,5 +49,3 @@ lint: verifier: name: testinfra - lint: - name: flake8 diff --git a/tripleo_ansible/roles/tuned/molecule/isolated/molecule.yml b/tripleo_ansible/roles/tuned/molecule/isolated/molecule.yml index 4237a6801..d499d5a85 100644 --- a/tripleo_ansible/roles/tuned/molecule/isolated/molecule.yml +++ b/tripleo_ansible/roles/tuned/molecule/isolated/molecule.yml @@ -49,5 +49,3 @@ lint: verifier: name: testinfra - lint: - name: flake8 diff --git a/tripleo_ansible/roles/tuned/tasks/tuned_config.yml b/tripleo_ansible/roles/tuned/tasks/tuned_config.yml index eb288ca97..f506e84a1 100644 --- a/tripleo_ansible/roles/tuned/tasks/tuned_config.yml +++ b/tripleo_ansible/roles/tuned/tasks/tuned_config.yml @@ -47,6 +47,7 @@ - not tuned_conf_stat_result.stat.exists - name: "Configure isolated cores for profile {{ tuned_profile }}" + become: true lineinfile: dest: "/etc/tuned/{{ tuned_profile }}-variables.conf" regexp: '^isolated_cores=.*' @@ -56,6 +57,7 @@ - tuned_conf_stat_result.stat.exists - name: Enable tuned profile + become: true command: >- tuned-adm profile {{ tuned_profile }} environment: diff --git a/zuul.d/molecule.yaml b/zuul.d/molecule.yaml index 1b4ec97b0..bb7ded93f 100644 --- a/zuul.d/molecule.yaml +++ b/zuul.d/molecule.yaml @@ -33,18 +33,12 @@ - tripleo-ansible-centos-8-molecule-tripleo-securetty - tripleo-ansible-centos-8-molecule-tripleo-cellv2 - tripleo-ansible-centos-8-molecule-tripleo-clients-install - - tripleo-ansible-centos-8-molecule-tripleo-validations-package - - tripleo-ansible-centos-8-molecule-tripleo-ovs-dpdk - - tripleo-ansible-centos-8-molecule-tripleo-sshd - - tripleo-ansible-centos-8-molecule-backup-and-restore - - tripleo-ansible-centos-8-molecule-tripleo-packages - tripleo-ansible-centos-8-molecule-tripleo-hosts-entries - tripleo-ansible-centos-8-molecule-tripleo-container-manage - tripleo-ansible-centos-8-molecule-tripleo-modules - tripleo-ansible-centos-8-molecule-tripleo-keystone-resources - tripleo-ansible-centos-8-molecule-tripleo-systemd-wrapper - tripleo-ansible-centos-8-molecule-tripleo-network-config - - tripleo-ansible-centos-8-molecule-tripleo-nova-image-cache - tripleo-ansible-centos-8-molecule-tripleo_nvdimm - tripleo-ansible-centos-8-molecule-tripleo_ha_wrapper - tripleo-ansible-centos-8-molecule-tripleo_lvmfilter @@ -82,18 +76,12 @@ - tripleo-ansible-centos-8-molecule-tripleo-securetty - tripleo-ansible-centos-8-molecule-tripleo-cellv2 - tripleo-ansible-centos-8-molecule-tripleo-clients-install - - tripleo-ansible-centos-8-molecule-tripleo-validations-package - - tripleo-ansible-centos-8-molecule-tripleo-ovs-dpdk - - tripleo-ansible-centos-8-molecule-tripleo-sshd - - tripleo-ansible-centos-8-molecule-backup-and-restore - - tripleo-ansible-centos-8-molecule-tripleo-packages - tripleo-ansible-centos-8-molecule-tripleo-hosts-entries - tripleo-ansible-centos-8-molecule-tripleo-container-manage - tripleo-ansible-centos-8-molecule-tripleo-modules - tripleo-ansible-centos-8-molecule-tripleo-keystone-resources - tripleo-ansible-centos-8-molecule-tripleo-systemd-wrapper - tripleo-ansible-centos-8-molecule-tripleo-network-config - - tripleo-ansible-centos-8-molecule-tripleo-nova-image-cache - tripleo-ansible-centos-8-molecule-tripleo_nvdimm - tripleo-ansible-centos-8-molecule-tripleo_ha_wrapper - tripleo-ansible-centos-8-molecule-tripleo_lvmfilter @@ -287,7 +275,6 @@ parent: tripleo-ansible-centos-8-base vars: tripleo_role_name: tripleo-network-config - - job: files: - ^tripleo_ansible/roles/tripleo-kernel/.* @@ -332,13 +319,6 @@ parent: tripleo-ansible-centos-8-base vars: tripleo_role_name: tripleo-clients-install -- job: - files: - - ^tripleo_ansible/roles/tripleo-validations-package/.* - name: tripleo-ansible-centos-8-molecule-tripleo-validations-package - parent: tripleo-ansible-centos-8-base - vars: - tripleo_role_name: tripleo-validations-package - job: files: - ^tripleo_ansible/roles/tripleo-redhat-enforce/.* @@ -346,13 +326,6 @@ parent: tripleo-ansible-centos-8-base vars: tox_envlist: tripleo-redhat-enforce -- job: - files: - - ^tripleo_ansible/roles/tripleo-ovs-dpdk/.* - name: tripleo-ansible-centos-8-molecule-tripleo-ovs-dpdk - parent: tripleo-ansible-centos-8-base - vars: - tripleo_role_name: tripleo-ovs-dpdk - job: files: - ^tripleo_ansible/roles/tripleo-sshd/.* @@ -360,20 +333,6 @@ parent: tripleo-ansible-centos-8-base vars: tripleo_role_name: tripleo-sshd -- job: - files: - - ^tripleo_ansible/roles/backup-and-restore/.* - name: tripleo-ansible-centos-8-molecule-backup-and-restore - parent: tripleo-ansible-centos-8-base - vars: - tripleo_role_name: backup-and-restore -- job: - files: - - ^tripleo_ansible/roles/tripleo-packages/.* - name: tripleo-ansible-centos-8-molecule-tripleo-packages - parent: tripleo-ansible-centos-8-base - vars: - tripleo_role_name: tripleo-packages - job: files: - ^tripleo_ansible/roles/tripleo-hosts-entries/.* @@ -399,7 +358,6 @@ vars: tripleo_role_name: tripleo-container-manage install_docker_c8: false - - job: files: - ^tripleo_ansible/ansible_plugins/.*$ @@ -409,7 +367,6 @@ parent: tripleo-ansible-centos-8-base vars: install_docker_c8: false - - job: files: - ^tripleo_ansible/roles/tripleo-keystone-resources/.* @@ -417,7 +374,6 @@ parent: tripleo-ansible-centos-8-base vars: tripleo_role_name: tripleo-keystone-resources - - job: files: - ^tripleo_ansible/roles/tripleo-systemd-wrapper/.* @@ -425,15 +381,6 @@ parent: tripleo-ansible-centos-8-base vars: tripleo_role_name: tripleo-systemd-wrapper -- job: - files: - - ^tripleo_ansible/roles/tripleo-nova-image-cache/.* - - ^tripleo_ansible/ansible_plugins/action/tripleo_nova_image_cache.py - - ^tripleo_ansible/ansible_plugins/modules/tripleo_nova_image_cache.py - name: tripleo-ansible-centos-8-molecule-tripleo-nova-image-cache - parent: tripleo-ansible-centos-8-base - vars: - tripleo_role_name: tripleo-nova-image-cache - job: files: - ^tripleo_ansible/roles/tripleo_nvdimm/.* diff --git a/zuul.d/playbooks/pre.yml b/zuul.d/playbooks/pre.yml index a8c6fe525..0874685a0 100644 --- a/zuul.d/playbooks/pre.yml +++ b/zuul.d/playbooks/pre.yml @@ -98,6 +98,13 @@ * hard nproc 4096 dest: /etc/security/limits.d/containers.conf + - name: Copy repos directory to opt workspace + copy: + src: /etc/yum.repos.d + dest: /opt/ + remote_src: true + mode: "0777" + - name: Reset ssh connection meta: reset_connection tasks: