Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 0b384a4

Browse files
committed
EL8
1 parent 1bcb5d3 commit 0b384a4

File tree

5 files changed

+56
-13
lines changed

5 files changed

+56
-13
lines changed

defaults/main.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,25 @@
11
---
2+
python_appstream:
3+
- python39
4+
- python39-cffi
5+
- python39-chardet
6+
- python39-click
7+
- python39-cryptography
8+
- python39-devel
9+
- python39-dns
10+
- python39-idle
11+
- python39-idna
12+
- python39-jmespath
13+
- python39-netaddr
14+
- python39-psutil
15+
- python39-pyyaml
16+
- python39-requests
17+
- python39-six
18+
- python39-test
19+
- python39-toml
20+
- python39-urllib3
21+
- python39-wheel
22+
- python39-xmltodict
223

324
# Software collections offer latest versions of programming languages
425
collections_enabled: true
@@ -21,7 +42,7 @@ python27_rhel:
2142
# These are installed on Centos 7 when collections_enabled: false
2243
python_epel:
2344
- python3-devel
24-
python_infix: python3.6
45+
- python3-cryptography
2546

2647
python_collection: rh-python38
2748

meta/main.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ galaxy_info:
99

1010
license: MIT
1111

12-
min_ansible_version: 2.5
12+
min_ansible_version: '2.9.27'
1313

1414
platforms:
1515
- name: EL
1616
versions:
17-
- 6
18-
- 7
17+
- '6'
18+
- '7'
19+
- '8'
1920

2021
galaxy_tags:
2122
- development

molecule/default/molecule.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ lint: |
1010
yamllint .
1111
ansible-lint
1212
platforms:
13+
- name: base-python-centos8
14+
image: quay.io/centos/centos:stream8
15+
privileged: true
1316
- name: base-python-centos7
1417
image: centos:7.9.2009
1518
privileged: true

tasks/main.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,12 @@
4242
- pip
4343

4444
- name: Install cryptography
45-
command: python3 -m pip install -U cryptography
46-
args:
47-
# yamllint disable-line rule:line-length
48-
creates: "{{ my_path }}/usr/local/lib64/{{ python_infix }}/site-packages/cryptography"
49-
ignore_errors: true # when redhat scl python is the only one.
50-
tags:
51-
- notest
45+
command: "{{ my_path }}/usr/bin/python3 --version"
46+
changed_when: false
47+
register: python_version
48+
49+
- name: Display version
50+
debug:
51+
msg: "{{ python_version.stdout_lines }}"
52+
5253
...

tasks/python-RedHat.yml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@
8686
state: absent
8787

8888
- name: 'Which pip'
89-
when: collections_enabled
89+
when:
90+
- collections_enabled
91+
- ansible_distribution_major_version|int == 7
9092
set_fact:
9193
python_infix: python3.8
9294
pip_executable: "/opt/rh/{{ python_collection }}/root/usr/bin/pip3"
@@ -98,9 +100,24 @@
98100
changed_when: false # for molecule
99101

100102
- name: 'Pip3 install cryptography'
101-
when: collections_enabled|bool
103+
when:
104+
- collections_enabled|bool
105+
- ansible_distribution_major_version|int == 7
102106
command: "{{ my_path }}/usr/local/bin/pip3 install cryptography"
103107
args:
104108
# yamllint disable-line rule:line-length
105109
creates: "{{ my_path }}/usr/local/lib64/{{ python_infix }}/site-packages/cryptography"
110+
111+
- name: 'Install python from AppStream'
112+
yum:
113+
name: "{{ python_appstream }}"
114+
state: present
115+
register: base_python_install
116+
until: base_python_install is success
117+
retries: 3
118+
delay: 2
119+
when:
120+
- ansible_distribution_major_version|int >= 8
121+
tags:
122+
- base_python
106123
...

0 commit comments

Comments
 (0)