-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
…ils when DHCP is enabled (#9568) Fix #9538 Inventory iocage fails when DHCP is enabled (#9539) * Fix #9538 Inventory iocage fails when DHCP is enbled. * Add changelog fragment 9539-iocage-inventory-dhcp.yml * Keep iocage_ip4 a string. * Rename the variable iocage_ip4 to iocage_ip4_dict in _parse_ip4. * Update the changelog fragment. * Rename _parse_ip4 parameter ip4_addr to ip4. * Fix changelog frangment present tense. * If IP is not available set iocage_ip4='-' instead of the empty string. * Update changelogs/fragments/9539-iocage-inventory-dhcp.yml Co-authored-by: Felix Fontein <[email protected]> --------- Co-authored-by: Felix Fontein <[email protected]> (cherry picked from commit 94d5256) Co-authored-by: Vladimir Botka <[email protected]>
- Loading branch information
1 parent
2314db5
commit 6907ae5
Showing
28 changed files
with
243 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
bugfixes: | ||
- iocage inventory plugin - the plugin parses the IP4 tab of the jails list and put the elements into the new variable ``iocage_ip4_dict``. In multiple interface format the variable ``iocage_ip4`` keeps the comma-separated list of IP4 (https://github.com/ansible-collections/community.general/issues/9538). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
9 changes: 9 additions & 0 deletions
9
tests/unit/plugins/inventory/fixtures/iocage/iocage_jails.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
+------+----------+------+-------+------+-----------------+---------------------+-----+----------------+----------+ | ||
| JID | NAME | BOOT | STATE | TYPE | RELEASE | IP4 | IP6 | TEMPLATE | BASEJAIL | | ||
+======+==========+======+=======+======+=================+=====================+=====+================+==========+ | ||
| - | test_101 | off | down | jail | 13.4-RELEASE-p2 | vnet0|10.1.0.101/24 | - | ansible_client | yes | | ||
+------+----------------+------+-------+------+-----------------+--------------------+-----+----------------+-----+ | ||
| - | test_102 | off | down | jail | 13.4-RELEASE-p2 | vnet0|10.1.0.102/24 | - | ansible_client | yes | | ||
+------+----------------+------+-------+------+-----------------+--------------------+-----+----------------+-----+ | ||
| - | test_103 | off | down | jail | 13.4-RELEASE-p2 | vnet0|10.1.0.103/24 | - | ansible_client | yes | | ||
+------+----------------+------+-------+------+-----------------+--------------------+-----+----------------+-----+ |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
9 changes: 9 additions & 0 deletions
9
tests/unit/plugins/inventory/fixtures/iocage/iocage_jails_dhcp.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
+------+----------------+------+-------+------+-----------------+--------------------+-----+----------------+----------+ | ||
| JID | NAME | BOOT | STATE | TYPE | RELEASE | IP4 | IP6 | TEMPLATE | BASEJAIL | | ||
+======+================+======+=======+======+=================+====================+=====+================+==========+ | ||
| 268 | test_111 | off | up | jail | 14.1-RELEASE-p6 | epair0b|10.1.0.174 | - | ansible_client | yes | | ||
+------+----------------+------+-------+------+-----------------+--------------------+-----+----------------+----------+ | ||
| 269 | test_112 | off | up | jail | 14.1-RELEASE-p6 | epair0b|10.1.0.147 | - | ansible_client | yes | | ||
+------+----------------+------+-------+------+-----------------+--------------------+-----+----------------+----------+ | ||
| 270 | test_113 | off | up | jail | 14.1-RELEASE-p6 | epair0b|10.1.0.231 | - | ansible_client | yes | | ||
+------+----------------+------+-------+------+-----------------+--------------------+-----+----------------+----------+ |
File renamed without changes.
50 changes: 50 additions & 0 deletions
50
tests/unit/plugins/inventory/fixtures/iocage/iocage_jails_dhcp.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
_meta: | ||
hostvars: | ||
test_111: | ||
iocage_basejail: 'yes' | ||
iocage_boot: 'off' | ||
iocage_ip4_dict: | ||
ip4: | ||
- ifc: epair0b | ||
ip: 10.1.0.174 | ||
mask: '-' | ||
msg: '' | ||
iocage_ip4: 10.1.0.174 | ||
iocage_ip6: '-' | ||
iocage_jid: '268' | ||
iocage_release: 14.1-RELEASE-p6 | ||
iocage_state: up | ||
iocage_template: ansible_client | ||
iocage_type: jail | ||
test_112: | ||
iocage_basejail: 'yes' | ||
iocage_boot: 'off' | ||
iocage_ip4_dict: | ||
ip4: | ||
- ifc: epair0b | ||
ip: 10.1.0.147 | ||
mask: '-' | ||
msg: '' | ||
iocage_ip4: 10.1.0.147 | ||
iocage_ip6: '-' | ||
iocage_jid: '269' | ||
iocage_release: 14.1-RELEASE-p6 | ||
iocage_state: up | ||
iocage_template: ansible_client | ||
iocage_type: jail | ||
test_113: | ||
iocage_basejail: 'yes' | ||
iocage_boot: 'off' | ||
iocage_ip4_dict: | ||
ip4: | ||
- ifc: epair0b | ||
ip: 10.1.0.231 | ||
mask: '-' | ||
msg: '' | ||
iocage_ip4: 10.1.0.231 | ||
iocage_ip6: '-' | ||
iocage_jid: '270' | ||
iocage_release: 14.1-RELEASE-p6 | ||
iocage_state: up | ||
iocage_template: ansible_client | ||
iocage_type: jail |
File renamed without changes.
9 changes: 9 additions & 0 deletions
9
tests/unit/plugins/inventory/fixtures/iocage/iocage_jails_dhcp_not_running.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
+------+----------------+------+-------+------+-----------------+--------------------+-----+----------------+----------+ | ||
| JID | NAME | BOOT | STATE | TYPE | RELEASE | IP4 | IP6 | TEMPLATE | BASEJAIL | | ||
+======+================+======+=======+======+=================+====================+=====+================+==========+ | ||
| None | test_111 | off | down | jail | 14.1-RELEASE-p6 | DHCP (not running) | - | ansible_client | yes | | ||
+------+----------------+------+-------+------+-----------------+--------------------+-----+----------------+----------+ | ||
| None | test_112 | off | down | jail | 14.1-RELEASE-p6 | DHCP (not running) | - | ansible_client | yes | | ||
+------+----------------+------+-------+------+-----------------+--------------------+-----+----------------+----------+ | ||
| None | test_113 | off | down | jail | 14.1-RELEASE-p6 | DHCP (not running) | - | ansible_client | yes | | ||
+------+----------------+------+-------+------+-----------------+--------------------+-----+----------------+----------+ |
File renamed without changes.
41 changes: 41 additions & 0 deletions
41
tests/unit/plugins/inventory/fixtures/iocage/iocage_jails_dhcp_not_running.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
_meta: | ||
hostvars: | ||
test_111: | ||
iocage_basejail: 'yes' | ||
iocage_boot: 'off' | ||
iocage_ip4_dict: | ||
ip4: [] | ||
msg: 'DHCP (not running)' | ||
iocage_ip4: '-' | ||
iocage_ip6: '-' | ||
iocage_jid: 'None' | ||
iocage_release: 14.1-RELEASE-p6 | ||
iocage_state: down | ||
iocage_template: ansible_client | ||
iocage_type: jail | ||
test_112: | ||
iocage_basejail: 'yes' | ||
iocage_boot: 'off' | ||
iocage_ip4_dict: | ||
ip4: [] | ||
msg: 'DHCP (not running)' | ||
iocage_ip4: '-' | ||
iocage_ip6: '-' | ||
iocage_jid: 'None' | ||
iocage_release: 14.1-RELEASE-p6 | ||
iocage_state: down | ||
iocage_template: ansible_client | ||
iocage_type: jail | ||
test_113: | ||
iocage_basejail: 'yes' | ||
iocage_boot: 'off' | ||
iocage_ip4_dict: | ||
ip4: [] | ||
msg: 'DHCP (not running)' | ||
iocage_ip4: '-' | ||
iocage_ip6: '-' | ||
iocage_jid: 'None' | ||
iocage_release: 14.1-RELEASE-p6 | ||
iocage_state: down | ||
iocage_template: ansible_client | ||
iocage_type: jail |
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
tests/unit/plugins/inventory/fixtures/iocage/iocage_properties.yml.license
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) | ||
SPDX-License-Identifier: GPL-3.0-or-later | ||
SPDX-FileCopyrightText: Ansible Project |
File renamed without changes.
3 changes: 3 additions & 0 deletions
3
tests/unit/plugins/inventory/fixtures/iocage/iocage_properties_test_101.txt.license
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) | ||
SPDX-License-Identifier: GPL-3.0-or-later | ||
SPDX-FileCopyrightText: Ansible Project |
File renamed without changes.
3 changes: 3 additions & 0 deletions
3
tests/unit/plugins/inventory/fixtures/iocage/iocage_properties_test_102.txt.license
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) | ||
SPDX-License-Identifier: GPL-3.0-or-later | ||
SPDX-FileCopyrightText: Ansible Project |
File renamed without changes.
3 changes: 3 additions & 0 deletions
3
tests/unit/plugins/inventory/fixtures/iocage/iocage_properties_test_103.txt.license
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) | ||
SPDX-License-Identifier: GPL-3.0-or-later | ||
SPDX-FileCopyrightText: Ansible Project |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters