starlingx
/
config
Code Issues Proposed changes

Merge "Cluster network cleanup"

This commit is contained in:
Zuul 2019-04-03 21:32:06 +00:00 committed by Gerrit Code Review
parent cc6e3cf215 f60ae9f5a4
commit 660cc509ca
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
puppet-manifests/src/modules/platform/manifests/config.pp
View File

@ -39,7 +39,10 @@ class platform::config::file {
# dependent template variables
$management_interface = $::platform::network::mgmt::params::interface_name
# TODO: infrastructure_interface will be removed when all the services are
# converted to use cluster_host_interface
$infrastructure_interface = $::platform::network::cluster_host::params::interface_name
$cluster_host_interface = $::platform::network::cluster_host::params::interface_name
$oam_interface = $::platform::network::oam::params::interface_name
$platform_conf = '/etc/platform/platform.conf'
@ -58,6 +61,7 @@ class platform::config::file {
}
}
# TODO: infrastructure_interface will be removed soon
if $infrastructure_interface {
file_line { "${platform_conf} infrastructure_interface":
path => '/etc/platform/platform.conf',
@ -66,6 +70,22 @@ class platform::config::file {
}
}
if $cluster_host_interface {
file_line { "${platform_conf} cluster_host_interface":
path => '/etc/platform/platform.conf',
line => "cluster_host_interface=${cluster_host_interface}",
match => '^cluster_host_interface=',
}
}
else {
file_line { "${platform_conf} cluster_host_interface":
ensure => absent,
path => '/etc/platform/platform.conf',
match => '^cluster_host_interface=',
match_for_absence => true,
}
}
if $oam_interface {
file_line { "${platform_conf} oam_interface":
path => $platform_conf,