From 77a792640bba9225f820582b97289549d05fd1a2 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 15 Mar 2026 15:41:00 +0900 Subject: [PATCH] neutron: Remove transition logic for l2gw config file renaming Change-Id: Ia7ac7ac3f5bc32bf3188f4b4e3272d289115be1e Signed-off-by: Takashi Kajinami --- manifests/neutron.pp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/manifests/neutron.pp b/manifests/neutron.pp index 32275590d..fb84f0dad 100644 --- a/manifests/neutron.pp +++ b/manifests/neutron.pp @@ -653,16 +653,4 @@ 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'], - } - } }