diff --git a/neutron-18.1.0.tar.gz b/neutron-15.3.4.tar.gz
similarity index 53%
rename from neutron-18.1.0.tar.gz
rename to neutron-15.3.4.tar.gz
index b8d3111..625bddc 100644
Binary files a/neutron-18.1.0.tar.gz and b/neutron-15.3.4.tar.gz differ
diff --git a/neutron-ovn-metadata-agent.service b/neutron-ovn-metadata-agent.service
deleted file mode 100644
index 5190755..0000000
--- a/neutron-ovn-metadata-agent.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=OpenStack Neutron OVN Metadata Agent
-After=syslog.target network.target openvswitch.service
-Requires=openvswitch.service
-
-[Service]
-Type=simple
-User=neutron
-PermissionsStartOnly=true
-ExecStart=/usr/bin/neutron-ovn-metadata-agent --config-file /etc/neutron/neutron_ovn_metadata_agent.ini --config-dir /etc/neutron/conf.d/neutron-ovn-metadata-agent --log-file /var/log/neutron/neutron-ovn-metadata-agent.log
-PrivateTmp=false
-KillMode=process
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-# (TODO) - Backwards compatibility in systemd service
-Alias=networking-ovn-metadata-agent
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index ed98e82..a480d63 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -17,8 +17,8 @@ Neutron API supports extensions to provide advanced network \
 capabilities (e.g., QoS, ACLs, network monitoring, etc.)
 
 Name:           openstack-%{service}
-Version:        18.1.0
-Release:        2
+Version:        15.3.4
+Release:        1
 Summary:        OpenStack Networking Service
 
 License:        ASL 2.0
@@ -51,7 +51,6 @@ Source34:       neutron-l2-agent-sysctl.conf
 # essentially because .modules files are shell scripts.
 Source35:       neutron-l2-agent.modules
 Source36:       neutron-destroy-patch-ports.service
-Source37:       neutron-ovn-metadata-agent.service
 # Required for tarball sources verification
 
 BuildArch:      noarch
@@ -60,7 +59,7 @@ BuildRequires:  git-core
 BuildRequires:  openstack-macros
 BuildRequires:  python3-devel
 BuildRequires:  python3-babel
-BuildRequires:  python3-keystoneauth1 >= 3.14.0
+BuildRequires:  python3-keystoneauth1
 BuildRequires:  python3-keystonemiddleware
 BuildRequires:  python3-neutron-lib
 BuildRequires:  python3-novaclient
@@ -76,13 +75,13 @@ BuildRequires:  python3-oslo-rootwrap
 BuildRequires:  python3-oslo-service
 BuildRequires:  python3-oslo-upgradecheck
 BuildRequires:  python3-oslo-versionedobjects
-BuildRequires:  python3-osprofiler >= 1.3.0
+BuildRequires:  python3-osprofiler
 BuildRequires:  python3-ovsdbapp
-BuildRequires:  python3-pbr >= 4.0.0
-BuildRequires:  python3-psutil >= 3.2.2
-BuildRequires:  python3-pyroute2 >= 0.5.13
-BuildRequires:  python3-pecan >= 1.3.2
-BuildRequires:  python3-tenacity >= 4.4.0
+BuildRequires:  python3-pbr
+BuildRequires:  python3-psutil
+BuildRequires:  python3-pyroute2
+BuildRequires:  python3-pecan
+BuildRequires:  python3-tenacity
 BuildRequires:  python3-os-vif
 BuildRequires:  systemd
 
@@ -91,8 +90,8 @@ Requires:       openstack-%{service}-common = %{version}-%{release}
 
 # dnsmasq is not a hard requirement, but is currently the only option
 # when neutron-dhcp-agent is deployed.
-Requires:       dnsmasq >= 2.76
-Requires:       dnsmasq-utils >= 2.76
+Requires:       dnsmasq
+Requires:       dnsmasq-utils
 
 # radvd is not a hard requirement, but is currently the only option
 # for IPv6 deployments.
@@ -111,7 +110,7 @@ Requires:       conntrack-tools
 Requires:       keepalived
 
 # haproxy implements metadata proxy process
-Requires:       haproxy >= 1.5.0
+Requires:       haproxy
 
 # Those are not hard requirements, ipset is used by ipset-cleanup in the subpackage,
 # iptables is used by the l3-agent which currently is not in a separate package,
@@ -136,63 +135,61 @@ Requires:       iproute-tc
 %package -n python3-%{service}
 Summary:        Neutron Python libraries
 %{?python_provide:%python_provide python3-%{service}}
-Requires:       python3-alembic >= 0.9.6
-Requires:       python3-debtcollector >= 1.19.0
-Requires:       python3-designateclient >= 2.7.0
-Requires:       python3-eventlet >= 0.22.1
-Requires:       python3-greenlet >= 0.4.10
-Requires:       python3-futurist >= 1.2.0
-Requires:       python3-jinja2 >= 2.10
-Requires:       python3-keystoneauth1 >= 3.14.0
-Requires:       python3-keystonemiddleware >= 5.1.0
-Requires:       python3-netaddr >= 0.7.18
-Requires:       python3-neutronclient >= 6.7.0
-Requires:       python3-neutron-lib >= 2.9.0
-Requires:       python3-novaclient >= 9.1.0
-Requires:       python3-os-vif >= 1.15.1
-Requires:       python3-oslo-cache >= 1.26.0
-Requires:       python3-oslo-concurrency >= 3.26.0
-Requires:       python3-oslo-config >= 8.0.0
-Requires:       python3-oslo-context >= 2.22.0
-Requires:       python3-oslo-db >= 4.44.0
-Requires:       python3-oslo-i18n >= 3.20.0
-Requires:       python3-oslo-log >= 4.3.0
-Requires:       python3-oslo-messaging >= 7.0.0
-Requires:       python3-oslo-middleware >= 3.31.0
-Requires:       python3-oslo-policy >= 3.6.2
-Requires:       python3-oslo-privsep >= 2.3.0
-Requires:       python3-oslo-reports >= 1.18.0
-Requires:       python3-oslo-rootwrap >= 5.8.0
-Requires:       python3-oslo-serialization >= 2.25.0
-Requires:       python3-oslo-service >= 1.31.0
-Requires:       python3-oslo-upgradecheck >= 1.3.0
-Requires:       python3-oslo-utils >= 4.5.0
-Requires:       python3-oslo-versionedobjects >= 1.35.1
-Requires:       python3-osprofiler >= 2.3.0
-Requires:       python3-ovsdbapp >= 1.7.0
-Requires:       python3-pecan >= 1.3.2
-Requires:       python3-pbr >= 4.0.0
-Requires:       python3-psutil >= 5.3.0
-Requires:       python3-pyroute2 >= 0.5.13
-Requires:       python3-requests >= 2.18.0
-Requires:       python3-tenacity >= 6.0.0
-Requires:       python3-routes >= 2.3.1
-Requires:       python3-os-ken >= 0.3.0
-Requires:       python3-sqlalchemy >= 1.2.0
-Requires:       python3-stevedore >= 1.20.0
-Requires:       python3-tooz >= 1.58.0
-Requires:       python3-webob >= 1.8.2
-Requires:       python3-openstacksdk >= 0.31.2
-Requires:       python3-pyOpenSSL >= 17.1.0
-Requires:       python3-packaging >= 20.4
+Requires:       python3-alembic
+Requires:       python3-debtcollector
+Requires:       python3-designateclient
+Requires:       python3-eventlet
+Requires:       python3-greenlet
+Requires:       python3-futurist
+Requires:       python3-jinja2
+Requires:       python3-keystoneauth1
+Requires:       python3-keystonemiddleware
+Requires:       python3-netaddr
+Requires:       python3-neutronclient
+Requires:       python3-neutron-lib
+Requires:       python3-novaclient
+Requires:       python3-os-vif
+Requires:       python3-oslo-cache
+Requires:       python3-oslo-concurrency
+Requires:       python3-oslo-config
+Requires:       python3-oslo-context
+Requires:       python3-oslo-db
+Requires:       python3-oslo-i18n
+Requires:       python3-oslo-log
+Requires:       python3-oslo-messaging
+Requires:       python3-oslo-middleware
+Requires:       python3-oslo-policy
+Requires:       python3-oslo-privsep
+Requires:       python3-oslo-reports
+Requires:       python3-oslo-rootwrap
+Requires:       python3-oslo-serialization
+Requires:       python3-oslo-service
+Requires:       python3-oslo-upgradecheck
+Requires:       python3-oslo-utils
+Requires:       python3-oslo-versionedobjects
+Requires:       python3-osprofiler
+Requires:       python3-ovsdbapp
+Requires:       python3-pecan
+Requires:       python3-pbr
+Requires:       python3-psutil
+Requires:       python3-pyroute2
+Requires:       python3-requests
+Requires:       python3-tenacity
+Requires:       python3-routes
+Requires:       python3-os-ken
+Requires:       python3-sqlalchemy
+Requires:       python3-stevedore
+Requires:       python3-tooz
+Requires:       python3-webob
+Requires:       python3-openstacksdk
+Requires:       python3-pyOpenSSL
+Requires:       python3-packaging
 
-Requires:       python3-httplib2 >= 0.9.1
-Requires:       python3-netifaces >= 0.10.4
-Requires:       python3-paste >= 2.0.2
-Requires:       python3-paste-deploy >= 1.5.0
-Requires:       python3-decorator >= 3.4.0
-
-Provides:       python3-networking-ovn = %{version}-%{release}
+Requires:       python3-httplib2
+Requires:       python3-netifaces
+Requires:       python3-paste
+Requires:       python3-paste-deploy
+Requires:       python3-decorator
 
 
 %description -n python3-%{service}
@@ -205,20 +202,20 @@ This package contains the Neutron Python library.
 Summary:        Neutron tests
 %{?python_provide:%python_provide python3-%{service}-tests}
 Requires:       python3-%{service} = %{version}-%{release}
-Requires:       python3-ddt >= 1.0.1
-Requires:       python3-fixtures >= 3.0.0
-Requires:       python3-mock >= 2.0
-Requires:       python3-subunit >= 0.0.18
-Requires:       python3-testrepository >= 0.0.18
-Requires:       python3-testtools >= 1.4.0
-Requires:       python3-testresources >= 0.2.4
-Requires:       python3-testscenarios >= 0.4
-Requires:       python3-oslotest >= 1.10.0
-Requires:       python3-os-testr >= 0.7.0
-Requires:       python3-PyMySQL >= 0.6.2
-Requires:       python3-tempest >= 12.1.0
+Requires:       python3-ddt
+Requires:       python3-fixtures
+Requires:       python3-mock
+Requires:       python3-subunit
+Requires:       python3-testrepository
+Requires:       python3-testtools
+Requires:       python3-testresources
+Requires:       python3-testscenarios
+Requires:       python3-oslotest
+Requires:       python3-os-testr
+Requires:       python3-PyMySQL
+Requires:       python3-tempest
 
-Requires:       python3-webtest >= 2.0
+Requires:       python3-webtest
 
 
 # pstree is used during functional testing to ensure our internal
@@ -307,7 +304,7 @@ Requires:       openstack-%{service}-common = %{version}-%{release}
 Requires:       ipset
 Requires:       iptables
 Requires:       openvswitch
-Requires:       python3-openvswitch >= 2.10.0
+Requires:       python3-openvswitch
 # kmod is needed to get access to /usr/sbin/modprobe needed by
 # neutron-enable-bridge-firewall.sh triggered by the service unit file
 Requires:       kmod
@@ -357,32 +354,6 @@ This package contains the Neutron agent to support advanced features of
 SR-IOV network cards.
 
 
-%package ovn-metadata-agent
-Summary:        OVN metadata agent
-BuildRequires:  systemd
-Requires:       python3-%{service} = %{version}-%{release}
-Requires:       openvswitch >= 2.10.0
-Provides:       python3-networking-ovn-metadata-agent = %{version}-%{release}
-%{?systemd_requires}
-
-%description ovn-metadata-agent
-OVN provides virtual networking for Open vSwitch and is a component of the
-Open vSwitch project.
-
-This package contains the agent that implements the metadata proxy so that VM's
-can retrieve metadata from OpenStack Nova.
-
-%package ovn-migration-tool
-Summary:        networking-ovn ML2/OVS to OVN migration tool
-Requires:       python3-%{service} = %{version}-%{release}
-Provides:       python3-networking-ovn-migration-tool = %{version}-%{release}
-
-%description ovn-migration-tool
-
-This package provides the necessary tools to update an existing ML2/OVS
-OpenStack to OVN based backend.
-
-
 %prep
 %autosetup -n %{service}-%{upstream_version} -S git 
 sed -i 's/\/usr\/bin\/python/\/usr\/bin\/python3/' %{SOURCE36}
@@ -453,8 +424,7 @@ mv %{buildroot}%{_sysconfdir}/%{service}/api-paste.ini %{buildroot}%{_datadir}/%
 install -d -m 755 %{buildroot}%{_sysconfdir}/%{service}/plugins/ml2
 
 mv etc/%{service}.conf %{buildroot}%{_sysconfdir}/%{service}/%{service}.conf
-mv etc/neutron/ovn.ini %{buildroot}%{_sysconfdir}/%{service}/ovn.ini
-for agent in dhcp l3 metadata metering neutron_ovn_metadata
+for agent in dhcp l3 metadata metering
 do
   mv etc/${agent}_agent.ini %{buildroot}%{_sysconfdir}/%{service}/${agent}_agent.ini
 done
@@ -463,16 +433,8 @@ do
   mv etc/%{service}/plugins/ml2/${file}.ini %{buildroot}%{_sysconfdir}/%{service}/plugins/ml2/${file}.ini
 done
 
-# (TODO) Backwards compatibility for networking-ovn-metadata-agent.ini
 
-install -d -m 755 %{buildroot}%{_sysconfdir}/neutron/plugins/networking-ovn
-ln -s /etc/neutron/neutron_ovn_metadata_agent.ini %{buildroot}%{_sysconfdir}/%{service}/plugins/networking-ovn/networking-ovn-metadata-agent.ini
 
-# (TODO) Backwards compatibility for ovn.ini
-ln -s /etc/neutron/ovn.ini %{buildroot}%{_sysconfdir}/%{service}/plugins/networking-ovn/networking-ovn.ini
-
-# (TODO) Backwards compatibility for networking-ovn-metadata-agent executable
-ln -s %{_bindir}/neutron-ovn-metadata-agent  %{buildroot}%{_bindir}/networking-ovn-metadata-agent
 
 # Install logrotate
 install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-%{service}
@@ -495,11 +457,7 @@ install -p -D -m 644 %{SOURCE22} %{buildroot}%{_unitdir}/neutron-netns-cleanup.s
 install -p -D -m 644 %{SOURCE29} %{buildroot}%{_unitdir}/neutron-rpc-server.service
 install -p -D -m 644 %{SOURCE32} %{buildroot}%{_unitdir}/neutron-linuxbridge-cleanup.service
 install -p -D -m 644 %{SOURCE36} %{buildroot}%{_unitdir}/neutron-destroy-patch-ports.service
-install -p -D -m 644 %{SOURCE37} %{buildroot}%{_unitdir}/neutron-ovn-metadata-agent.service
 
-# (TODO) - Backwards compatibility for systemd unit networking-ovn-metadata-agent
-
-ln -s %{_unitdir}/neutron-ovn-metadata-agent.service %{buildroot}%{_unitdir}/networking-ovn-metadata-agent.service
 
 # Install helper scripts
 install -p -D -m 755 %{SOURCE33} %{buildroot}%{_bindir}/neutron-enable-bridge-firewall.sh
@@ -537,7 +495,7 @@ mkdir -p %{buildroot}/%{_sysconfdir}/%{service}/conf.d/common
 for service in server rpc-server ovs-cleanup netns-cleanup linuxbridge-cleanup macvtap-agent; do
     mkdir -p %{buildroot}/%{_sysconfdir}/%{service}/conf.d/%{service}-$service
 done
-for service in linuxbridge openvswitch dhcp l3 metadata metering sriov-nic ovn-metadata; do
+for service in linuxbridge openvswitch dhcp l3 metadata metering sriov-nic; do
     mkdir -p %{buildroot}/%{_sysconfdir}/%{service}/conf.d/%{service}-$service-agent
 done
 
@@ -664,19 +622,6 @@ fi
 %systemd_postun_with_restart neutron-sriov-nic-agent.service
 %cleanup_orphan_rootwrap_daemons
 
-
-%post ovn-metadata-agent
-%systemd_post neutron-ovn-metadata-agent.service
-
-
-%preun ovn-metadata-agent
-%systemd_preun neutron-ovn-metadata-agent.service
-
-
-%postun ovn-metadata-agent
-%systemd_postun_with_restart neutron-ovn-metadata-agent.service
-
-
 %files
 %license LICENSE
 %{_bindir}/neutron-api
@@ -695,9 +640,7 @@ fi
 %{_bindir}/neutron-status
 %{_bindir}/neutron-server
 %{_bindir}/neutron-usage-audit
-%{_bindir}/neutron-ovn-metadata-agent
-%{_bindir}/networking-ovn-metadata-agent
-%{_bindir}/neutron-ovn-db-sync-util
+%{_bindir}/neutron-rootwrap-xen-dom0
 %{_unitdir}/neutron-dhcp-agent.service
 %{_unitdir}/neutron-l3-agent.service
 %{_unitdir}/neutron-metadata-agent.service
@@ -748,8 +691,6 @@ fi
 %dir %{_sysconfdir}/%{service}/plugins
 %attr(-, root, %{service}) %{_datadir}/%{service}/%{service}-dist.conf
 %config(noreplace) %attr(0640, root, %{service}) %{_sysconfdir}/%{service}/%{service}.conf
-%config(noreplace) %attr(0640, root, %{service}) %{_sysconfdir}/%{service}/ovn.ini
-%{_sysconfdir}/%{service}/plugins/networking-ovn/networking-ovn.ini
 %config(noreplace) %{_sysconfdir}/%{service}/rootwrap.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/*
 %{_sysconfdir}/sudoers.d/%{service}
@@ -763,6 +704,8 @@ fi
 %{_datarootdir}/%{service}/rootwrap/ipset-firewall.filters
 %{_datarootdir}/%{service}/rootwrap/l3.filters
 %{_datarootdir}/%{service}/rootwrap/privsep.filters
+%{_datarootdir}/%{service}/rootwrap/ebtables.filters
+%{_datarootdir}/%{service}/rootwrap/iptables-firewall.filters
 
 
 %files linuxbridge
@@ -828,33 +771,7 @@ fi
 %config(noreplace) %attr(0640, root, %{service}) %{_sysconfdir}/%{service}/plugins/ml2/sriov_agent.ini
 %dir %{_sysconfdir}/%{service}/conf.d/%{service}-sriov-nic-agent
 
-
-%files ovn-metadata-agent
-%license LICENSE
-%{_bindir}/neutron-ovn-metadata-agent
-%{_bindir}/networking-ovn-metadata-agent
-%{_unitdir}/neutron-ovn-metadata-agent.service
-%{_unitdir}/networking-ovn-metadata-agent.service
-%config(noreplace) %attr(0640, root, %{service}) %{_sysconfdir}/%{service}/neutron_ovn_metadata_agent.ini
-%dir %{_sysconfdir}/neutron/plugins/networking-ovn
-%{_sysconfdir}/neutron/plugins/networking-ovn/networking-ovn-metadata-agent.ini
-/etc/neutron/plugins/networking-ovn/networking-ovn.ini
-%dir %{_sysconfdir}/neutron/conf.d/neutron-ovn-metadata-agent
-
-
-%files ovn-migration-tool
-%license LICENSE
-%{_bindir}/neutron-ovn-migration-mtu
-%{_bindir}/ovn_migration.sh
-%{_datadir}/ansible/neutron-ovn-migration/
-
 %changelog
-* Thu Sep 09 2021 wangxiyuan <wangxiyuan1007@gmail.com> 18.1.0-2
-- Add conntrack-tools to linuxbride Requires
-
-* Fri Jul 23 2021 liksh <liks11@chinaunicom.cn> 18.1.0-1
-- Update to 18.1.0
-
-* Fri Jan 15 2021 joec88 <joseph.chn1988@gmail.com> 17.0.0-1
-- openEuler build release
+* Fri Nov 05 2021 wangxiyuan <wangxiyuan1007@gmail.com> 15.3.4-1
+- Support OpenStack Train release