Browse Source

Convert all of the fedora28 container usage to centos8

This change moves all of the fedora28 container images to centos8 to ensure
we're maximizing coverage in all of our roles with OS images that represent
real deployments. While fedora28 was useful to exercise RHEL8 code path's
while there was no RHEL/CentOS8 container image, we can now use the upstream
CentOS8 image ensuring we're getting a true, representitive, environment.

> In the process of testsing it was noticed that the test_deps role was
  triggering scenario jobs. This role is only used for test purposes and
  should not test scenarios deployments.

Molecule requirements have been updated to ensure we're testing with package
versions that reflect the realities of production deployments.

Hacks that were added to enable fedora28 testing have been removed.

The ptp role now only will test the ntp stop scenario on centos7. This is
done because there is no NTP package/service in centos8.

Note on the backport to Train:
I had to manually apply this change:
https://review.opendev.org/#/c/693010/3/tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/verify.yml
Because it wasn't applied from https://review.opendev.org/#/c/700446/

Change-Id: I0e960f9ee230c82edb2ad9d40557aa6d0237dfc0
Signed-off-by: Kevin Carter <kecarter@redhat.com>
(cherry picked from commit db3692bd5e)
changes/20/706620/3
Kevin Carter Emilien Macchi 3 months ago
parent
commit
02c8f0eaff
100 changed files with 247 additions and 242 deletions
  1. +1
    -1
      _skeleton_role_/molecule/default/Dockerfile.j2
  2. +3
    -3
      _skeleton_role_/molecule/default/molecule.yml
  3. +1
    -0
      molecule-requirements.txt
  4. +1
    -1
      tripleo_ansible/roles/aide/molecule/default/Dockerfile
  5. +3
    -3
      tripleo_ansible/roles/aide/molecule/default/molecule.yml
  6. +1
    -1
      tripleo_ansible/roles/backup-and-restore/molecule/default/Dockerfile
  7. +2
    -2
      tripleo_ansible/roles/backup-and-restore/molecule/default/prepare.yml
  8. +1
    -1
      tripleo_ansible/roles/login-defs/molecule/default/Dockerfile
  9. +3
    -3
      tripleo_ansible/roles/login-defs/molecule/default/molecule.yml
  10. +1
    -0
      tripleo_ansible/roles/test_deps/defaults/main.yml
  11. +1
    -1
      tripleo_ansible/roles/test_deps/molecule/default/Dockerfile
  12. +3
    -3
      tripleo_ansible/roles/test_deps/molecule/default/molecule.yml
  13. +7
    -8
      tripleo_ansible/roles/test_deps/tasks/main.yml
  14. +0
    -5
      tripleo_ansible/roles/test_deps/tasks/tripleo-setup.yml
  15. +3
    -0
      tripleo_ansible/roles/test_deps/vars/redhat-8.yml
  16. +1
    -1
      tripleo_ansible/roles/test_json_error_callback/molecule/default/Dockerfile
  17. +3
    -3
      tripleo_ansible/roles/test_json_error_callback/molecule/default/molecule.yml
  18. +1
    -1
      tripleo_ansible/roles/test_package_action/molecule/default/Dockerfile
  19. +3
    -3
      tripleo_ansible/roles/test_package_action/molecule/default/molecule.yml
  20. +1
    -1
      tripleo_ansible/roles/test_package_action/molecule/negative/Dockerfile
  21. +3
    -3
      tripleo_ansible/roles/test_package_action/molecule/negative/molecule.yml
  22. +1
    -1
      tripleo_ansible/roles/test_package_action/molecule/positive/Dockerfile
  23. +3
    -3
      tripleo_ansible/roles/test_package_action/molecule/positive/molecule.yml
  24. +1
    -1
      tripleo_ansible/roles/tripleo-bootstrap/molecule/default/Dockerfile
  25. +4
    -4
      tripleo_ansible/roles/tripleo-bootstrap/molecule/default/molecule.yml
  26. +1
    -1
      tripleo_ansible/roles/tripleo-cellv2/molecule/default/Dockerfile
  27. +3
    -3
      tripleo_ansible/roles/tripleo-cellv2/molecule/default/molecule.yml
  28. +1
    -1
      tripleo_ansible/roles/tripleo-ceph-common/molecule/default/Dockerfile
  29. +3
    -3
      tripleo_ansible/roles/tripleo-ceph-common/molecule/default/molecule.yml
  30. +1
    -1
      tripleo_ansible/roles/tripleo-ceph-fetch-dir/molecule/default/Dockerfile
  31. +3
    -3
      tripleo_ansible/roles/tripleo-ceph-fetch-dir/molecule/default/molecule.yml
  32. +1
    -1
      tripleo_ansible/roles/tripleo-ceph-run-ansible/molecule/default/Dockerfile
  33. +3
    -3
      tripleo_ansible/roles/tripleo-ceph-run-ansible/molecule/default/molecule.yml
  34. +1
    -1
      tripleo_ansible/roles/tripleo-ceph-uuid/molecule/default/Dockerfile
  35. +3
    -3
      tripleo_ansible/roles/tripleo-ceph-uuid/molecule/default/molecule.yml
  36. +1
    -1
      tripleo_ansible/roles/tripleo-ceph-work-dir/molecule/default/Dockerfile
  37. +3
    -3
      tripleo_ansible/roles/tripleo-ceph-work-dir/molecule/default/molecule.yml
  38. +1
    -1
      tripleo_ansible/roles/tripleo-clients-install/molecule/default/Dockerfile
  39. +3
    -3
      tripleo_ansible/roles/tripleo-clients-install/molecule/default/molecule.yml
  40. +1
    -1
      tripleo_ansible/roles/tripleo-config/molecule/default/Dockerfile
  41. +3
    -3
      tripleo_ansible/roles/tripleo-config/molecule/default/molecule.yml
  42. +1
    -1
      tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/Dockerfile
  43. +20
    -18
      tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/molecule.yml
  44. +1
    -1
      tripleo_ansible/roles/tripleo-container-image-prepare/molecule/default/Dockerfile
  45. +3
    -3
      tripleo_ansible/roles/tripleo-container-image-prepare/molecule/default/molecule.yml
  46. +2
    -2
      tripleo_ansible/roles/tripleo-container-rm/molecule/default/prepare.yml
  47. +1
    -1
      tripleo_ansible/roles/tripleo-container-rm/molecule/legacy_vars/prepare.yml
  48. +1
    -1
      tripleo_ansible/roles/tripleo-container-rm/molecule/podman-rm-stopped/prepare.yml
  49. +1
    -1
      tripleo_ansible/roles/tripleo-container-rm/molecule/podman/prepare.yml
  50. +1
    -1
      tripleo_ansible/roles/tripleo-container-stop/molecule/default/Dockerfile
  51. +2
    -2
      tripleo_ansible/roles/tripleo-container-stop/molecule/default/prepare.yml
  52. +1
    -1
      tripleo_ansible/roles/tripleo-container-stop/molecule/podman/Dockerfile
  53. +1
    -1
      tripleo_ansible/roles/tripleo-container-stop/molecule/podman/prepare.yml
  54. +2
    -2
      tripleo_ansible/roles/tripleo-container-tag/molecule/default/playbook.yml
  55. +2
    -2
      tripleo_ansible/roles/tripleo-container-tag/molecule/default/prepare.yml
  56. +2
    -2
      tripleo_ansible/roles/tripleo-container-tag/molecule/legacy_vars/playbook.yml
  57. +2
    -2
      tripleo_ansible/roles/tripleo-container-tag/molecule/podman/playbook.yml
  58. +1
    -1
      tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/Dockerfile
  59. +3
    -3
      tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/molecule.yml
  60. +1
    -1
      tripleo_ansible/roles/tripleo-create-admin/molecule/default/Dockerfile
  61. +3
    -3
      tripleo_ansible/roles/tripleo-create-admin/molecule/default/molecule.yml
  62. +1
    -1
      tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/Dockerfile
  63. +3
    -3
      tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/molecule.yml
  64. +1
    -1
      tripleo_ansible/roles/tripleo-hieradata/molecule/default/Dockerfile
  65. +3
    -3
      tripleo_ansible/roles/tripleo-hieradata/molecule/default/molecule.yml
  66. +1
    -1
      tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/Dockerfile
  67. +4
    -4
      tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/molecule.yml
  68. +1
    -1
      tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/Dockerfile
  69. +4
    -4
      tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/molecule.yml
  70. +3
    -3
      tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/verify.yml
  71. +1
    -1
      tripleo_ansible/roles/tripleo-image-serve/molecule/default/Dockerfile
  72. +3
    -3
      tripleo_ansible/roles/tripleo-image-serve/molecule/default/molecule.yml
  73. +1
    -1
      tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/Dockerfile
  74. +3
    -3
      tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/molecule.yml
  75. +1
    -1
      tripleo_ansible/roles/tripleo-kernel/molecule/default/Dockerfile
  76. +1
    -1
      tripleo_ansible/roles/tripleo-kernel/molecule/extra/Dockerfile
  77. +1
    -1
      tripleo_ansible/roles/tripleo-kernel/molecule/kernelargs/Dockerfile
  78. +1
    -1
      tripleo_ansible/roles/tripleo-module-load/molecule/default/Dockerfile
  79. +1
    -1
      tripleo_ansible/roles/tripleo-module-load/molecule/legacy_vars/Dockerfile
  80. +1
    -1
      tripleo_ansible/roles/tripleo-module-load/molecule/remove_module/Dockerfile
  81. +2
    -2
      tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/Dockerfile
  82. +3
    -3
      tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/molecule.yml
  83. +1
    -1
      tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/prepare.yml
  84. +2
    -2
      tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/Dockerfile
  85. +3
    -3
      tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/molecule.yml
  86. +1
    -1
      tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/prepare.yml
  87. +1
    -1
      tripleo_ansible/roles/tripleo-packages/molecule/default/Dockerfile
  88. +3
    -3
      tripleo_ansible/roles/tripleo-packages/molecule/default/molecule.yml
  89. +1
    -1
      tripleo_ansible/roles/tripleo-packages/molecule/external_upgrade/Dockerfile
  90. +3
    -3
      tripleo_ansible/roles/tripleo-packages/molecule/external_upgrade/molecule.yml
  91. +1
    -1
      tripleo_ansible/roles/tripleo-packages/molecule/ffu/Dockerfile
  92. +3
    -3
      tripleo_ansible/roles/tripleo-packages/molecule/ffu/molecule.yml
  93. +1
    -1
      tripleo_ansible/roles/tripleo-packages/molecule/update/Dockerfile
  94. +24
    -22
      tripleo_ansible/roles/tripleo-packages/molecule/update/molecule.yml
  95. +1
    -1
      tripleo_ansible/roles/tripleo-packages/molecule/upgrade/Dockerfile
  96. +20
    -18
      tripleo_ansible/roles/tripleo-packages/molecule/upgrade/molecule.yml
  97. +1
    -1
      tripleo_ansible/roles/tripleo-persist/molecule/default/Dockerfile
  98. +3
    -3
      tripleo_ansible/roles/tripleo-persist/molecule/default/molecule.yml
  99. +2
    -2
      tripleo_ansible/roles/tripleo-podman/molecule/default/prepare.yml
  100. +1
    -1
      tripleo_ansible/roles/tripleo-ptp/molecule/default/Dockerfile

+ 1
- 1
_skeleton_role_/molecule/default/Dockerfile.j2 View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
_skeleton_role_/molecule/default/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 0
molecule-requirements.txt View File

@@ -9,6 +9,7 @@ pytest-xdist
mock
molecule==3.0a5
netaddr
jinja2>=2.8.0,<3

# this is required for the docs build jobs
sphinx


+ 1
- 1
tripleo_ansible/roles/aide/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/aide/molecule/default/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/backup-and-restore/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 2
- 2
tripleo_ansible/roles/backup-and-restore/molecule/default/prepare.yml View File

@@ -76,7 +76,7 @@

- name: pull an image
docker_image:
name: fedora:28
name: centos:8
source: pull
vars:
ansible_python_interpreter: "{{ ansible_user_dir }}/test-python/bin/python"
@@ -84,7 +84,7 @@
- name: Create a data container
docker_container:
name: "{{ item }}"
image: fedora:28
image: centos:8
detach: true
command: sleep 1d
with_items:


+ 1
- 1
tripleo_ansible/roles/login-defs/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/login-defs/molecule/default/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 0
tripleo_ansible/roles/test_deps/defaults/main.yml View File

@@ -17,3 +17,4 @@

test_deps_extra_packages: []
test_deps_setup_tripleo: false
test_deps_repo_version: "{{ ansible_distribution | lower }}{{ ansible_distribution_major_version }}-master"

+ 1
- 1
tripleo_ansible/roles/test_deps/molecule/default/Dockerfile View File

@@ -23,7 +23,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/test_deps/molecule/default/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 7
- 8
tripleo_ansible/roles/test_deps/tasks/main.yml View File

@@ -31,27 +31,26 @@
tags:
- always

- include_tasks: tripleo-setup.yml
when:
- (ansible_os_family | lower) == 'redhat'
- test_deps_setup_tripleo | bool

- name: RHEL Block
become: true
when:
- (ansible_os_family | lower) == 'redhat'
- not (test_deps_setup_tripleo | bool)
block:
- name: install deplorean repo
get_url:
url: "https://trunk.rdoproject.org/{{ ansible_distribution | lower }}{{ ansible_distribution_major_version }}-master/current-tripleo/delorean.repo"
url: "https://trunk.rdoproject.org/{{ test_deps_repo_version }}/current-tripleo/delorean.repo"
dest: /etc/yum.repos.d/delorean.repo

- name: install deplorean-deps repo
get_url:
url: "https://trunk.rdoproject.org/{{ ansible_distribution | lower }}{{ ansible_distribution_major_version }}-master/delorean-deps.repo"
url: "https://trunk.rdoproject.org/{{ test_deps_repo_version }}/delorean-deps.repo"
dest: /etc/yum.repos.d/delorean-deps.repo

- include_tasks: tripleo-setup.yml
when:
- (ansible_os_family | lower) == 'redhat'
- test_deps_setup_tripleo | bool

- name: Package block
become: true
block:


+ 0
- 5
tripleo_ansible/roles/test_deps/tasks/tripleo-setup.yml View File

@@ -33,11 +33,6 @@
name: "{{ test_deps_repo }}/{{ tripleo_package_fact }}"
state: present

- name: Enable tripleo repository
command: >-
tripleo-repos {{ test_deps_tripleo_repos }}
changed_when: false

- name: Install tripleo packages
package:
name: "{{ test_deps_tripleo_packages }}"


+ 3
- 0
tripleo_ansible/roles/test_deps/vars/redhat-8.yml View File

@@ -21,3 +21,6 @@ test_deps_selinux_packages:
test_deps_tripleo_packages:
- python3-tripleoclient
test_deps_tripleo_repos: current-tripleo

# TODO(cloudnull): when RDO has centos8 repos remove this.
test_deps_repo_version: fedora28-master

+ 1
- 1
tripleo_ansible/roles/test_json_error_callback/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/test_json_error_callback/molecule/default/molecule.yml View File

@@ -18,9 +18,9 @@ platforms:
volumes:
- /tmp:/tmp

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/test_package_action/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/test_package_action/molecule/default/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/test_package_action/molecule/negative/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/test_package_action/molecule/negative/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/test_package_action/molecule/positive/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/test_package_action/molecule/positive/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/tripleo-bootstrap/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 4
- 4
tripleo_ansible/roles/tripleo-bootstrap/molecule/default/molecule.yml View File

@@ -25,11 +25,11 @@ platforms:
- /run/udev:/run/udev:ro
- /sys/fs/cgroup:/sys/fs/cgroup:ro

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
pkg_extras: python*-setuptools NetworkManager
environment:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"


+ 1
- 1
tripleo_ansible/roles/tripleo-cellv2/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/tripleo-cellv2/molecule/default/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/tripleo-ceph-common/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/tripleo-ceph-common/molecule/default/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/tripleo-ceph-fetch-dir/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/tripleo-ceph-fetch-dir/molecule/default/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/tripleo-ceph-run-ansible/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/tripleo-ceph-run-ansible/molecule/default/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/tripleo-ceph-uuid/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/tripleo-ceph-uuid/molecule/default/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/tripleo-ceph-work-dir/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/tripleo-ceph-work-dir/molecule/default/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/tripleo-clients-install/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/tripleo-clients-install/molecule/default/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/tripleo-config/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/tripleo-config/molecule/default/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 20
- 18
tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/molecule.yml View File

@@ -28,24 +28,26 @@ platforms:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
- /var/run/docker.sock:/var/run/docker.sock

- name: fedora28
hostname: fedora28
image: fedora:28
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"
command: /sbin/init
privileged: true
security_opts:
- seccomp=unconfined
tmpfs:
- /run
- /tmp
capabilities:
- ALL
volumes: *vols
# 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
# privileged: true
# security_opts:
# - seccomp=unconfined
# tmpfs:
# - /run
# - /tmp
# capabilities:
# - ALL
# volumes: *vols

- name: registry
hostname: registry


+ 1
- 1
tripleo_ansible/roles/tripleo-container-image-prepare/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/tripleo-container-image-prepare/molecule/default/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 2
- 2
tripleo_ansible/roles/tripleo-container-rm/molecule/default/prepare.yml View File

@@ -58,7 +58,7 @@

- name: pull an image
docker_image:
name: fedora:28
name: centos:8
source: pull
vars:
ansible_python_interpreter: "{{ ansible_user_dir }}/test-python/bin/python"
@@ -66,7 +66,7 @@
- name: Create a data container
docker_container:
name: "{{ item }}"
image: fedora:28
image: centos:8
detach: true
command: sleep 1d
with_items:


+ 1
- 1
tripleo_ansible/roles/tripleo-container-rm/molecule/legacy_vars/prepare.yml View File

@@ -32,7 +32,7 @@
state: latest

- name: Pull container image
command: "podman pull fedora:28"
command: "podman pull centos:8"

- name: Create test containers
command: "podman run -itd --systemd --name {{ item }} fedora bash"


+ 1
- 1
tripleo_ansible/roles/tripleo-container-rm/molecule/podman-rm-stopped/prepare.yml View File

@@ -32,7 +32,7 @@
state: latest

- name: Pull container image
command: "podman pull fedora:28"
command: "podman pull centos:8"

- name: Create test containers
command: "podman run -itd --systemd --name {{ item }} fedora bash"


+ 1
- 1
tripleo_ansible/roles/tripleo-container-rm/molecule/podman/prepare.yml View File

@@ -32,7 +32,7 @@
state: latest

- name: Pull container image
command: "podman pull fedora:28"
command: "podman pull centos:8"

- name: Create test containers
command: "podman run -itd --systemd --name {{ item }} fedora bash"


+ 1
- 1
tripleo_ansible/roles/tripleo-container-stop/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 2
- 2
tripleo_ansible/roles/tripleo-container-stop/molecule/default/prepare.yml View File

@@ -58,7 +58,7 @@

- name: pull an image
docker_image:
name: fedora:28
name: centos:8
source: pull
vars:
ansible_python_interpreter: "{{ ansible_user_dir }}/test-python/bin/python"
@@ -66,7 +66,7 @@
- name: Create a data container
docker_container:
name: "{{ item }}"
image: fedora:28
image: centos:8
detach: true
command: sleep 1d
with_items:


+ 1
- 1
tripleo_ansible/roles/tripleo-container-stop/molecule/podman/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 1
- 1
tripleo_ansible/roles/tripleo-container-stop/molecule/podman/prepare.yml View File

@@ -32,7 +32,7 @@
state: latest

- name: Pull container image
command: "podman pull fedora:28"
command: "podman pull centos:8"

- name: Create test containers
command: "podman run -itd --systemd --name {{ item }} fedora bash"


+ 2
- 2
tripleo_ansible/roles/tripleo-container-tag/molecule/default/playbook.yml View File

@@ -20,12 +20,12 @@
hosts: all
roles:
- role: "tripleo-container-tag"
tripleo_container_image: fedora:28
tripleo_container_image: centos:8
tripleo_container_image_latest: test-latest
tripleo_container_cli: docker
tripleo_container_pull_image: true
- role: "tripleo-container-tag"
tripleo_container_image: fedora:28
tripleo_container_image: centos:8
tripleo_container_image_latest: test-latest-2
tripleo_container_cli: docker
tripleo_container_pull_image: false

+ 2
- 2
tripleo_ansible/roles/tripleo-container-tag/molecule/default/prepare.yml View File

@@ -58,7 +58,7 @@

- name: pull an image
docker_image:
name: fedora:28
name: centos:8
source: pull
vars:
ansible_python_interpreter: "{{ ansible_user_dir }}/test-python/bin/python"
@@ -66,6 +66,6 @@
- name: Create a data container
docker_container:
name: test-container
image: fedora:28
image: centos:8
vars:
ansible_python_interpreter: "{{ ansible_user_dir }}/test-python/bin/python"

+ 2
- 2
tripleo_ansible/roles/tripleo-container-tag/molecule/legacy_vars/playbook.yml View File

@@ -20,11 +20,11 @@
become: true
roles:
- role: "tripleo-container-tag"
container_image: fedora:28
container_image: centos:8
container_image_latest: test-latest
container_cli: podman
- role: "tripleo-container-tag"
container_image: fedora:28
container_image: centos:8
container_image_latest: test-latest-2
container_cli: podman
container_pull_image: false

+ 2
- 2
tripleo_ansible/roles/tripleo-container-tag/molecule/podman/playbook.yml View File

@@ -20,11 +20,11 @@
become: true
roles:
- role: "tripleo-container-tag"
tripleo_container_image: fedora:28
tripleo_container_image: centos:8
tripleo_container_image_latest: test-latest
tripleo_container_cli: podman
- role: "tripleo-container-tag"
tripleo_container_image: fedora:28
tripleo_container_image: centos:8
tripleo_container_image_latest: test-latest-2
tripleo_container_cli: podman
tripleo_container_pull_image: false

+ 1
- 1
tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/tripleo-create-admin/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/tripleo-create-admin/molecule/default/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/tripleo-hieradata/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/tripleo-hieradata/molecule/default/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 4
- 4
tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:
@@ -255,7 +255,7 @@ provisioner:
validate_ntp: true
Standalone:
hosts:
fedora28: {}
centos8: {}
centos7: {}
log: true
env:


+ 1
- 1
tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 4
- 4
tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:
@@ -51,7 +51,7 @@ provisioner:
children:
overcloud:
hosts:
fedora28:
centos8:
hostname_resolve_network: ctlplane
ctlplane_ip: 192.168.24.1
internal_api_ip: 172.17.0.1


+ 3
- 3
tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/verify.yml View File

@@ -29,9 +29,9 @@
- 192.168.24.2 centos7.localdomain centos7
- 192.168.24.2 centos7.ctlplane.localdomain centos7.ctlplane
- 172.17.0.2 centos7.internalapi.localdomain centos7.internalapi
- 192.168.24.1 fedora28.localdomain fedora28
- 192.168.24.1 fedora28.ctlplane.localdomain fedora28.ctlplane
- 172.17.0.1 fedora28.internalapi.localdomain fedora28.internalapi
- 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

- name: slurp /tmp/hosts
slurp:


+ 1
- 1
tripleo_ansible/roles/tripleo-image-serve/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/tripleo-image-serve/molecule/default/molecule.yml View File

@@ -25,9 +25,9 @@ platforms:
- /run/udev:/run/udev:ro
- /sys/fs/cgroup:/sys/fs/cgroup:ro

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/molecule.yml View File

@@ -25,9 +25,9 @@ platforms:
- /run/udev:/run/udev:ro
- /sys/fs/cgroup:/sys/fs/cgroup:ro

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/tripleo-kernel/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 1
- 1
tripleo_ansible/roles/tripleo-kernel/molecule/extra/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 1
- 1
tripleo_ansible/roles/tripleo-kernel/molecule/kernelargs/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 1
- 1
tripleo_ansible/roles/tripleo-module-load/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 1
- 1
tripleo_ansible/roles/tripleo-module-load/molecule/legacy_vars/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 1
- 1
tripleo_ansible/roles/tripleo-module-load/molecule/remove_module/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 2
- 2
tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/Dockerfile View File

@@ -22,8 +22,8 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install openvswitch python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y openvswitch python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \
elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates {{ item.pkg_extras | default('') }} && xbps-remove -O; fi


+ 3
- 3
tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/molecule.yml View File

@@ -26,9 +26,9 @@ platforms:
- /run/udev:/run/udev:ro
- /sys/fs/cgroup:/sys/fs/cgroup:ro

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/prepare.yml View File

@@ -24,7 +24,7 @@
- name: Install ovs
package:
name:
- openvswitch
- openvswitch*
- libibverbs
state: present



+ 2
- 2
tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/Dockerfile View File

@@ -22,8 +22,8 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install openvswitch python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y openvswitch python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \
elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates {{ item.pkg_extras | default('') }} && xbps-remove -O; fi


+ 3
- 3
tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/molecule.yml View File

@@ -26,9 +26,9 @@ platforms:
- /run/udev:/run/udev:ro
- /sys/fs/cgroup:/sys/fs/cgroup:ro

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/prepare.yml View File

@@ -24,7 +24,7 @@
- name: Install ovs
package:
name:
- openvswitch
- openvswitch*
- libibverbs
state: present



+ 1
- 1
tripleo_ansible/roles/tripleo-packages/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/tripleo-packages/molecule/default/molecule.yml View File

@@ -25,9 +25,9 @@ platforms:
- /dev:/dev
- /lib/modules:/lib/modules

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/tripleo-packages/molecule/external_upgrade/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/tripleo-packages/molecule/external_upgrade/molecule.yml View File

@@ -25,9 +25,9 @@ platforms:
- /dev:/dev
- /lib/modules:/lib/modules

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/tripleo-packages/molecule/ffu/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/tripleo-packages/molecule/ffu/molecule.yml View File

@@ -25,9 +25,9 @@ platforms:
- /dev:/dev
- /lib/modules:/lib/modules

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 1
- 1
tripleo_ansible/roles/tripleo-packages/molecule/update/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 24
- 22
tripleo_ansible/roles/tripleo-packages/molecule/update/molecule.yml View File

@@ -29,28 +29,30 @@ platforms:
- /dev:/dev
- /lib/modules:/lib/modules

- name: fedora28
hostname: fedora28
image: fedora:28
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
privileged: true
tmpfs:
- /run
- /tmp
capabilities:
- ALL
volumes:
- /dev:/dev
- /lib/modules:/lib/modules
# 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
# privileged: true
# tmpfs:
# - /run
# - /tmp
# capabilities:
# - ALL
# volumes:
# - /dev:/dev
# - /lib/modules:/lib/modules

provisioner:
name: ansible


+ 1
- 1
tripleo_ansible/roles/tripleo-packages/molecule/upgrade/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 20
- 18
tripleo_ansible/roles/tripleo-packages/molecule/upgrade/molecule.yml View File

@@ -25,24 +25,26 @@ platforms:
- /dev:/dev
- /lib/modules:/lib/modules

- name: fedora28
hostname: fedora28
image: fedora:28
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
privileged: true
tmpfs:
- /run
- /tmp
capabilities:
- ALL
volumes:
- /dev:/dev
- /lib/modules:/lib/modules
# 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
# privileged: true
# tmpfs:
# - /run
# - /tmp
# capabilities:
# - ALL
# volumes:
# - /dev:/dev
# - /lib/modules:/lib/modules

provisioner:
name: ansible


+ 1
- 1
tripleo_ansible/roles/tripleo-persist/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


+ 3
- 3
tripleo_ansible/roles/tripleo-persist/molecule/default/molecule.yml View File

@@ -16,9 +16,9 @@ platforms:
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"

- name: fedora28
hostname: fedora28
image: fedora:28
- name: centos8
hostname: centos8
image: centos:8
dockerfile: Dockerfile
pkg_extras: python*-setuptools
environment:


+ 2
- 2
tripleo_ansible/roles/tripleo-podman/molecule/default/prepare.yml View File

@@ -58,7 +58,7 @@

- name: pull an image
docker_image:
name: fedora:28
name: centos:8
source: pull
vars:
ansible_python_interpreter: "{{ ansible_user_dir }}/test-python/bin/python"
@@ -66,7 +66,7 @@
- name: Create a data container
docker_container:
name: "{{ item }}"
image: fedora:28
image: centos:8
detach: true
command: sleep 1d
with_items:


+ 1
- 1
tripleo_ansible/roles/tripleo-ptp/molecule/default/Dockerfile View File

@@ -22,7 +22,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save