starlingx/stx-puppet
Code Issues Proposed changes

Merge "Add k8s cfg file to the OAM firewall script"

Browse Source
This commit is contained in:
Zuul 2023-10-10 21:06:06 +00:00 committed by Gerrit Code Review
commit e49328c20a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
puppet-manifests/src/modules/platform/manifests/firewall.pp
View File

@ -157,6 +157,11 @@ class platform::firewall::calico::oam (
) {
if $config != {} {
$apply_script = 'calico_firewall_apply_policy.sh'
if $::personality == 'worker' {
$cfgf = '/etc/kubernetes/kubelet.conf'
} elsif $::personality == 'controller' {
$cfgf = '/etc/kubernetes/admin.conf'
}
$yaml_config = hash2yaml($config)
$gnp_name = "${::personality}-oam-if-gnp"
$file_name_gnp = "/tmp/gnp_${gnp_name}.yaml"
@ -169,7 +174,7 @@ class platform::firewall::calico::oam (
}
-> exec { "apply globalnetworkpolicies ${gnp_name} with ${file_name_gnp}":
path => '/usr/bin:/usr/sbin:/bin:/usr/local/bin',
command => "${apply_script} ${gnp_name} ${file_name_gnp}",
command => "${apply_script} ${gnp_name} ${file_name_gnp} ${cfgf}",
logoutput => true
}
}