Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Fw Builder
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Geant DevOps
Fw Builder
Commits
c71a24b1
Unverified
Commit
c71a24b1
authored
2 years ago
by
Max Adamo
Browse files
Options
Downloads
Patches
Plain Diff
allow empty key
parent
61997977
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
functions/fw_builder_public_ips.pp
+4
-10
4 additions, 10 deletions
functions/fw_builder_public_ips.pp
with
4 additions
and
10 deletions
functions/fw_builder_public_ips.pp
+
4
−
10
View file @
c71a24b1
...
...
@@ -24,24 +24,18 @@ function fw_builder::fw_builder_public_ips(
Optional
[
Array
]
$facts_ipsets
)
>>
Array
{
if
$facts_fw_conf
=~
Undef
or
$facts_ipsets
=~
Undef
{
# when puppet runs for the first time these facts are not available
if
$facts_fw_conf
=~
Undef
or
$facts_ipsets
=~
Undef
{
$public_ipsets
=
[]
}
elsif
$facts_fw_conf
[
'public'
]
=~
String
{
# if public is empty it's seen as empty string
}
elsif
$facts_fw_conf
[
'public'
]
=~
String
{
$public_ipsets
=
[]
}
else
{
if
'public'
in
$facts_fw_conf
{
# this check is not needed, but it will be necessary if the
# code of fw_builder changes and "public" can be absent
# if public is present and contains some value
if
'public'
in
$facts_fw_conf
and
$facts_fw_conf
[
'public'
]
!~
Undef
{
$facts_fw_conf_public
=
$facts_fw_conf
[
'public'
]
# fail on empty hash
if
$facts_fw_conf_public
=~
Undef
{
fail
(
'fw_builder public is declared but it\'s empty. Please either delete it or add proper values'
)
}
# create a list of lists with all the ipsets in public
$unflattened_public_ipsets
=
$facts_fw_conf_public
.
map
|
$app_key
,
$app_value
|
{
if
'ipset'
in
keys
(
$facts_fw_conf_public
[
$app_key
])
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment