Skip to content

Commit

Permalink
Update role to Leap 15.6
Browse files Browse the repository at this point in the history
Updates the role to Leap 15.5 and 15.6 and remove references to Leap
15.4.

Also fix the CI to work with newer versions on molecule.
  • Loading branch information
grisu48 committed Jul 11, 2024
1 parent 1e9acd5 commit 880e96c
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 16 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,12 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.x'
- name: Install dependencies
run: pip3 install ansible molecule[docker] docker pytest testinfra
python-version: '3.11'
- name: Install requirements
run: sudo apt-get install docker python3-pip
- name: Install molecule
# https://www.jeffgeerling.com/blog/2024/newer-versions-ansible-dont-work-rhel-8[]
run: "pip3 install 'ansible-core<2.17' molecule molecule-plugins[docker] pytest testinfra"

Check warning on line 40 in .github/workflows/CI.yml

View workflow job for this annotation

GitHub Actions / Lint

40:81 [line-length] line too long (98 > 80 characters)

Check warning on line 40 in .github/workflows/CI.yml

View workflow job for this annotation

GitHub Actions / Lint

40:81 [line-length] line too long (98 > 80 characters)
- name: Run Molecule
run: molecule test
env:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

Configurable ansible role for setting up a nginx webserver on a Linux server. Works with

- openSUSE Leap 15.3
- openSUSE Leap 15.4
- Debian Buster
- openSUSE Leap 15.5
- openSUSE Leap 15.6
- Debian Buster (11)

## Role Variables
--------------
Expand Down
4 changes: 2 additions & 2 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ galaxy_info:
platforms:
- name: opensuse
versions:
- 15.3
- 15.4
- 15.5
- 15.6
- name: debian
versions:
- bullseye
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.opensuse.org/opensuse/leap:15.4
FROM registry.opensuse.org/opensuse/leap:15.5

# Install systemd and development tools, clear cache
RUN zypper in -y systemd systemd-sysvinit firewalld python3 python3-firewall curl && rm -rf /var/cache/*
Expand Down
7 changes: 7 additions & 0 deletions molecule/default/Dockerfile.leap15_6
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM registry.opensuse.org/opensuse/leap:15.6

# Install systemd and development tools, clear cache
RUN zypper in -y systemd systemd-sysvinit firewalld python3 python3-firewall curl && rm -rf /var/cache/*

# Start container with systemd
ENTRYPOINT ["/usr/sbin/init"]
22 changes: 18 additions & 4 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,18 @@ dependency:
driver:
name: docker
platforms:
- name: leap15_4
image: registry.opensuse.org/opensuse/leap:15.4
dockerfile: Dockerfile.leap15_4
- name: leap15_5
image: registry.opensuse.org/opensuse/leap:15.5
dockerfile: Dockerfile.leap15_5
command: ${MOLECULE_DOCKER_COMMAND:-"/usr/sbin/init"}
privileged: true
cgroupns: host
tmpfs:
- /run
- /tmp
- name: leap15_6
image: registry.opensuse.org/opensuse/leap:15.6
dockerfile: Dockerfile.leap15_6
command: ${MOLECULE_DOCKER_COMMAND:-"/usr/sbin/init"}
privileged: true
cgroupns: host
Expand Down Expand Up @@ -35,9 +44,14 @@ provisioner:
name: ansible
inventory:
host_vars:
leap15_4:
leap15_5:
vhosts_dir: "/etc/nginx/vhosts.d"
deploy_nginx_config: true
ansible_python_interpreter: "/usr/bin/python3"
leap15_6:
vhosts_dir: "/etc/nginx/vhosts.d"
deploy_nginx_config: true
ansible_python_interpreter: "/usr/bin/python3"
bullseye:
vhosts_dir: "/etc/nginx/sites-enabled"
deploy_nginx_config: false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
# openSUSE Leap 15.4 specific variables
# openSUSE Leap 15.5 specific variables

## Software packages

Expand Down
4 changes: 2 additions & 2 deletions vars/openSUSE Leap_15.3.yml → vars/openSUSE Leap_15.6.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
# openSUSE Leap 15.3 specific variables
# openSUSE Leap 15.6 specific variables

## Software packages

packages: ['nginx', 'nginx-module-brotli']
packages: ['nginx']
nginx_service: "nginx"

## OS-Specific directories
Expand Down

0 comments on commit 880e96c

Please sign in to comment.