Skip to content

Commit

Permalink
Merge branch 'main' into automated/cookstyle
Browse files Browse the repository at this point in the history
  • Loading branch information
Stromweld authored May 1, 2024
2 parents cc88902 + 6ff7dd9 commit 65f5dd3
Show file tree
Hide file tree
Showing 16 changed files with 285 additions and 245 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name: ci

jobs:
lint-unit:
uses: sous-chefs/.github/.github/workflows/lint-unit.yml@3.0.0
uses: sous-chefs/.github/.github/workflows/lint-unit.yml@3.1.1
permissions:
actions: write
checks: write
Expand Down Expand Up @@ -41,9 +41,9 @@ jobs:
- name: Check out code
uses: actions/checkout@v4
- name: Install Chef
uses: actionshub/chef-install@2.0.4
uses: actionshub/chef-install@3.0.0
- name: Dokken
uses: actionshub/test-kitchen@2.1.0
uses: actionshub/test-kitchen@3.0.0
env:
CHEF_LICENSE: accept-no-persist
KITCHEN_LOCAL_YAML: kitchen.dokken.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v8
- uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
close-issue-message: >
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@ This file is used to list changes made in each version of isc_kea.
- resolved cookstyle error: resources/config_dhcp4_subnet_pool_option_data.rb:56:11 refactor: `Chef/RedundantCode/UnnecessaryDesiredState`
- resolved cookstyle error: resources/config_dhcp6_subnet_pool_option_data.rb:56:11 refactor: `Chef/RedundantCode/UnnecessaryDesiredState`

## 1.4.3 - *2024-05-01*

## 1.4.2 - *2024-05-01*

## 1.4.1 - *2023-12-21*

## 1.4.0 - *2023-12-20*

- Add `ddns_conflict_resolution_mode` property for Kea 2.5

## 1.3.0 - *2023-12-19*

- Add Dhcp4/6 subnet pool option data resources
Expand Down
87 changes: 44 additions & 43 deletions documentation/isc_kea_config_dhcp4.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,46 +13,47 @@

## Properties

| Name | Name? | Type | Default | Description | Allowed Values |
| -------------------------------- | ----- | ---------------------- | ------- | ----------- | --------------------------------------------- |
| `authoritative` | | true, false | | | |
| `boot_file_name` | | String | | | |
| `cache_threshold` | | Integer | | | |
| `cache_max_age` | | Integer | | | |
| `calculate_tee_times` | | true, false | | | |
| `ddns_generated_prefix` | | String | | | |
| `ddns_override_client_update` | | true, false | | | |
| `ddns_override_no_update` | | true, false | | | |
| `ddns_replace_client_name` | | String, Symbol | | | never, always, when-present, when-not-present |
| `ddns_qualifying_suffix` | | String | | | |
| `ddns_send_updates` | | true, false | | | |
| `ddns_ttl_percent` | | Float, Integer, String | | | |
| `ddns_update_on_renew` | | true, false | | | |
| `ddns_use_conflict_resolution` | | true, false | | | |
| `decline_probation_period` | | Integer | | | |
| `dhcp4o6_port` | | Integer | | | |
| `echo_client_id` | | true, false | | | |
| `host_reservation_identifiers` | | Array | | | |
| `hostname_char_set` | | String | | | |
| `hostname_char_replacement` | | String | | | |
| `ip_reservations_unique` | | true, false | | | |
| `match_client_id` | | true, false | | | |
| `min_preferred_lifetime` | | Integer | | | |
| `min_valid_lifetime` | | Integer | | | |
| `max_preferred_lifetime` | | Integer | | | |
| `max_valid_lifetime` | | Integer | | | |
| `next_server` | | String | | | |
| `parked_packet_limit` | | Integer | | | |
| `rebind_timer` | | Integer | | | |
| `renew_timer` | | Integer | | | |
| `reservations_global` | | true, false | | | |
| `reservations_in_subnet` | | true, false | | | |
| `reservations_out_of_pool` | | true, false | | | |
| `server_hostname` | | String | | | |
| `server_tag` | | String | | | |
| `statistic_default_sample_count` | | Integer | | | |
| `statistic_default_sample_age` | | Integer | | | |
| `store_extended_info` | | true, false | | | |
| `t1_percent` | | Integer, Float | | | |
| `t2_percent` | | Integer, Float | | | |
| `valid_lifetime` | | Integer | | | |
| Name | Name? | Type | Default | Description | Allowed Values |
| -------------------------------- | ----- | ---------------------- | ------- | ----------- | ------------------------------------------------------------------------------------- |
| `authoritative` | | true, false | | | |
| `boot_file_name` | | String | | | |
| `cache_threshold` | | Integer | | | |
| `cache_max_age` | | Integer | | | |
| `calculate_tee_times` | | true, false | | | |
| `ddns_generated_prefix` | | String | | | |
| `ddns_override_client_update` | | true, false | | | |
| `ddns_override_no_update` | | true, false | | | |
| `ddns_replace_client_name` | | String, Symbol | | | never, always, when-present, when-not-present |
| `ddns_qualifying_suffix` | | String | | | |
| `ddns_send_updates` | | true, false | | | |
| `ddns_ttl_percent` | | Float, Integer, String | | | |
| `ddns_update_on_renew` | | true, false | | | |
| `ddns_use_conflict_resolution` | | true, false | | | |
| `ddns_conflict_resolution-mode` | | String, Symbol | | | check-with-dhcid, no-check-with-dhcid, check-exists-with-dhcid,no-check-without-dhcid |
| `decline_probation_period` | | Integer | | | |
| `dhcp4o6_port` | | Integer | | | |
| `echo_client_id` | | true, false | | | |
| `host_reservation_identifiers` | | Array | | | |
| `hostname_char_set` | | String | | | |
| `hostname_char_replacement` | | String | | | |
| `ip_reservations_unique` | | true, false | | | |
| `match_client_id` | | true, false | | | |
| `min_preferred_lifetime` | | Integer | | | |
| `min_valid_lifetime` | | Integer | | | |
| `max_preferred_lifetime` | | Integer | | | |
| `max_valid_lifetime` | | Integer | | | |
| `next_server` | | String | | | |
| `parked_packet_limit` | | Integer | | | |
| `rebind_timer` | | Integer | | | |
| `renew_timer` | | Integer | | | |
| `reservations_global` | | true, false | | | |
| `reservations_in_subnet` | | true, false | | | |
| `reservations_out_of_pool` | | true, false | | | |
| `server_hostname` | | String | | | |
| `server_tag` | | String | | | |
| `statistic_default_sample_count` | | Integer | | | |
| `statistic_default_sample_age` | | Integer | | | |
| `store_extended_info` | | true, false | | | |
| `t1_percent` | | Integer, Float | | | |
| `t2_percent` | | Integer, Float | | | |
| `valid_lifetime` | | Integer | | | |
Loading

0 comments on commit 65f5dd3

Please sign in to comment.