Handle transition of networking-l2gw service config file
The file was renamed from l2gw_plugin.ini to networking_l2gw.conf . Create a symlink to handle this transition. Change-Id: Ie6be48bb762d0c0ac71941da84c4c08e4444ed45 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
@@ -308,7 +308,7 @@ class openstack_integration::neutron (
|
||||
default => undef,
|
||||
}
|
||||
$l2gw_conf = $l2gw_enabled ? {
|
||||
true => 'l2gw_plugin.ini',
|
||||
true => 'networking_l2gw.conf',
|
||||
default => undef,
|
||||
}
|
||||
|
||||
@@ -596,4 +596,16 @@ Environment=OS_NEUTRON_CONFIG_FILES=${join($neutron_conf_files, ';')}",
|
||||
auth_url => $::openstack_integration::config::keystone_admin_uri,
|
||||
password => 'a_big_secret',
|
||||
}
|
||||
|
||||
# TODO(tkajinam): Remove this once the following change is available
|
||||
# https://review.opendev.org/c/x/networking-l2gw/+/951422
|
||||
if $l2gw_enabled {
|
||||
file { '/etc/neutron/networking_l2gw.conf':
|
||||
ensure => 'link',
|
||||
target => '/etc/neutron/l2gw_plugin.ini',
|
||||
replace => false,
|
||||
require => Anchor['neutron::install::end'],
|
||||
before => Anchor['neutron::config::begin'],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user