Skip to content

Commit

Permalink
Updated supported platforms
Browse files Browse the repository at this point in the history
- Sync `kitchen.yml` with standardized settings
- Move `keepalived` service resource to the end to fix issues with RHEL-9

Signed-off-by: Lance Albertson <lance@osuosl.org>
  • Loading branch information
ramereth committed Nov 15, 2024
1 parent 68286c5 commit fe499f6
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 23 deletions.
18 changes: 11 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,17 @@ jobs:
strategy:
matrix:
os:
- "amazonlinux-2023"
- "centos-stream-8"
- "centos-stream-9"
- "debian-11"
- "debian-12"
- "ubuntu-2004"
- "ubuntu-2204"
- almalinux-8
- almalinux-9
- amazonlinux-2023
- centos-stream-9
- debian-11
- debian-12
- rockylinux-8
- rockylinux-9
- ubuntu-2004
- ubuntu-2204
- ubuntu-2404
suite:
- "default"
fail-fast: false
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ This file is used to list changes made in each version of the keepalived cookboo

## Unreleased

- Updated supported platforms
- Sync `kitchen.yml` with standardized settings
- Move `keepalived` service resource to the end to fix issues with RHEL-9

## 6.0.19 - *2024-07-15*

- Fixed a bug that duplicated the `notify_master` script in a `vrrp_instance`
Expand Down
4 changes: 2 additions & 2 deletions kitchen.dokken.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ platforms:
image: dokken/ubuntu-22.04
pid_one_command: /bin/systemd

- name: ubuntu-23.04
- name: ubuntu-24.04
driver:
image: dokken/ubuntu-23.04
image: dokken/ubuntu-24.04
pid_one_command: /bin/systemd
24 changes: 17 additions & 7 deletions kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,30 @@ driver:
name: vagrant

provisioner:
name: chef_zero
name: chef_infra
product_name: <%= ENV['CHEF_PRODUCT_NAME'] || 'chef' %>
product_version: <%= ENV['CHEF_VERSION'] || 'latest' %>
chef_license: accept-no-persist
enforce_idempotency: true
multiple_converge: 2
deprecations_as_errors: true
log_level: <%= ENV['CHEF_LOG_LEVEL'] || 'auto' %>

verifier:
name: inspec

platforms:
- name: amazonlinux-2
- name: centos-7
- name: centos-8
- name: debian-10
- name: debian-9
- name: ubuntu-18.04
- name: almalinux-8
- name: almalinux-9
- name: amazonlinux-2023
- name: centos-stream-9
- name: debian-11
- name: debian-12
- name: rockylinux-8
- name: rockylinux-9
- name: ubuntu-20.04
- name: ubuntu-22.04
- name: ubuntu-24.04

suites:
- name: default
Expand Down
11 changes: 4 additions & 7 deletions test/cookbooks/test/recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,6 @@
# include_recipe 'keepalived::default'
keepalived_install 'keepalived'

service 'keepalived' do
action [:enable, :start]
end

# this enables us to bind ips which are not really present
execute 'sysctl -w net.ipv4.ip_nonlocal_bind=1'

global_defs_extra_options = { 'foo' => 'bar', 'other' => [1, 2, 3] }

keepalived_global_defs 'global_defs' do
Expand Down Expand Up @@ -177,3 +170,7 @@
virtual_router_id 1
action :delete
end

service 'keepalived' do
action [:enable, :start]
end

0 comments on commit fe499f6

Please sign in to comment.