Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Fedora support #114

Merged
merged 1 commit into from Aug 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -10,6 +10,7 @@
- Allow specifying array of `allow` and `deny` declarations in `dhcp_subnet` `pool`
- Convert to custom resources
- Drop support for Chef 12
- Add support for Fedora

## 5.5.0 (2018-03-04)

Expand Down
1 change: 1 addition & 0 deletions README.md
Expand Up @@ -25,6 +25,7 @@ This cookbook is maintained by the Sous Chefs. The Sous Chefs are a community of

- Debian / Ubuntu
- CentOS and derivatives
- Fedora and derivatives

## Chef-client

Expand Down
2 changes: 1 addition & 1 deletion attributes/default.rb
Expand Up @@ -54,7 +54,7 @@
default['dhcp']['config_file'] = '/etc/dhcp/dhcpd.conf'

case node['platform_family']
when 'rhel'
when 'rhel', 'fedora'
default['dhcp']['package_name'] = 'dhcp'
default['dhcp']['service_name'] = 'dhcpd'
default['dhcp']['init_config'] = '/etc/sysconfig/dhcpd'
Expand Down
7 changes: 7 additions & 0 deletions kitchen.dokken.yml
Expand Up @@ -31,3 +31,10 @@ platforms:
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update

- name: fedora-30
driver:
image: dokken/fedora-30
pid_one_command: /usr/lib/systemd/systemd
intermediate_instructions:
- RUN /usr/bin/yum install libselinux-utils -y
2 changes: 2 additions & 0 deletions kitchen.yml
Expand Up @@ -7,6 +7,7 @@ driver:
provisioner:
name: chef_zero
deprecations_as_errors: true
chef_license: accept

verifier:
name: inspec
Expand All @@ -15,6 +16,7 @@ platforms:
- name: centos-7
- name: debian-8
- name: ubuntu-16.04
- name: fedora-30

suites:
- name: default
Expand Down
1 change: 1 addition & 0 deletions metadata.rb
Expand Up @@ -13,5 +13,6 @@
supports 'ubuntu'
supports 'centos'
supports 'redhat'
supports 'fedora'
supports 'scientific'
supports 'oracle'
1 change: 1 addition & 0 deletions recipes/_service.rb
Expand Up @@ -12,4 +12,5 @@
interfaces: node['dhcp']['interfaces'],
var: node['dhcp']['init_iface']
)
not_if { platform_family?('fedora') }
end
3 changes: 3 additions & 0 deletions test/integration/default/inspec/default_spec.rb
Expand Up @@ -4,6 +4,9 @@
when 'redhat'
package_name = 'dhcp'
service_name = 'dhcpd'
when 'fedora'
package_name = 'dhcp-server'
service_name = 'dhcpd'
when 'debian', 'ubuntu'
package_name = 'isc-dhcp-server'
service_name = 'isc-dhcp-server'
Expand Down