[openstack-neutron/el6-icehouse] Update to upstream 2014.1.1
Ihar Hrachyshka
ihrachyshka at fedoraproject.org
Fri Jun 13 10:58:52 UTC 2014
commit 084ce370129c795057c9eb66a42274f21b1b545c
Author: Ihar Hrachyshka <ihrachys at redhat.com>
Date: Fri Jun 13 12:48:02 2014 +0200
Update to upstream 2014.1.1
Changelog:
- Update to upstream 2014.1.1
- Added previously missing ml2_conf_mlnx.ini, bz#1100136
.gitignore | 1 +
...-use-parallel-installed-versions-in-RHEL6.patch | 2 +-
0002-Remove-dnsmasq-version-warning.patch | 2 +-
0003-remove-runtime-dependency-on-pbr.patch | 2 +-
...e-and-systemd-modules-from-oslo-incubator.patch | 2 +-
0005-Removed-signing_dir-from-neutron.conf.patch | 4 +-
...Remove-kernel-version-check-for-OVS-VXLAN.patch | 22 +-
...DR-given-as-ip-prefix-in-security-group-r.patch | 254 --------------------
...ing-key-is-specified-in-the-address-for-a.patch | 4 +-
....10-raises-ValueError-instead-of-AddrForm.patch | 30 ---
openstack-neutron.spec | 28 ++-
sources | 2 +-
12 files changed, 36 insertions(+), 317 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4fa728f..662b700 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/neutron-2014.1.rc1.tar.gz
/neutron-2014.1.rc2.tar.gz
/neutron-2014.1.tar.gz
+/neutron-2014.1.1.tar.gz
diff --git a/0001-use-parallel-installed-versions-in-RHEL6.patch b/0001-use-parallel-installed-versions-in-RHEL6.patch
index 35f448e..0693890 100644
--- a/0001-use-parallel-installed-versions-in-RHEL6.patch
+++ b/0001-use-parallel-installed-versions-in-RHEL6.patch
@@ -1,4 +1,4 @@
-From 0daac79152939a86a9c00fa6bc322d0809512fae Mon Sep 17 00:00:00 2001
+From 51ccb186c88ad108eb5e9f808d987c068ac5ecc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
Date: Fri, 13 Apr 2012 17:24:40 +0100
Subject: [PATCH] use parallel installed versions in RHEL6
diff --git a/0002-Remove-dnsmasq-version-warning.patch b/0002-Remove-dnsmasq-version-warning.patch
index 04fb391..bce9180 100644
--- a/0002-Remove-dnsmasq-version-warning.patch
+++ b/0002-Remove-dnsmasq-version-warning.patch
@@ -1,4 +1,4 @@
-From 9c61e9292a1e271e219f46b80ba2a8f1cd5b91c4 Mon Sep 17 00:00:00 2001
+From 9ca90822cdaef5ef102d953a5cc59c5ed1eb4aa6 Mon Sep 17 00:00:00 2001
From: Terry Wilson <twilson at redhat.com>
Date: Fri, 13 Dec 2013 09:41:43 -0600
Subject: [PATCH] Remove dnsmasq version warning
diff --git a/0003-remove-runtime-dependency-on-pbr.patch b/0003-remove-runtime-dependency-on-pbr.patch
index fd04acf..4ce10cd 100644
--- a/0003-remove-runtime-dependency-on-pbr.patch
+++ b/0003-remove-runtime-dependency-on-pbr.patch
@@ -1,4 +1,4 @@
-From 105b193d1f4d12c91affd4fe3cfe8fc9aa5a820a Mon Sep 17 00:00:00 2001
+From 16c69ff1d86391ac97d2ed2bfc863513694655fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
Date: Mon, 24 Mar 2014 14:50:23 +0000
Subject: [PATCH] remove runtime dependency on pbr
diff --git a/0004-Sync-service-and-systemd-modules-from-oslo-incubator.patch b/0004-Sync-service-and-systemd-modules-from-oslo-incubator.patch
index d5fa105..1387f91 100644
--- a/0004-Sync-service-and-systemd-modules-from-oslo-incubator.patch
+++ b/0004-Sync-service-and-systemd-modules-from-oslo-incubator.patch
@@ -1,4 +1,4 @@
-From cc5830176b15813883b6e591b6373d7edbb33d37 Mon Sep 17 00:00:00 2001
+From f0bbb2c80e84848967885599d8b57f0710d7d44c Mon Sep 17 00:00:00 2001
From: Jakub Libosvar <libosvar at redhat.com>
Date: Mon, 17 Mar 2014 16:36:01 +0100
Subject: [PATCH] Sync service and systemd modules from oslo-incubator
diff --git a/0005-Removed-signing_dir-from-neutron.conf.patch b/0005-Removed-signing_dir-from-neutron.conf.patch
index 65aecd0..69104b3 100644
--- a/0005-Removed-signing_dir-from-neutron.conf.patch
+++ b/0005-Removed-signing_dir-from-neutron.conf.patch
@@ -1,4 +1,4 @@
-From 9738c5431008e2412e3b7509ff49a155b8cf175e Mon Sep 17 00:00:00 2001
+From 1e61f12a0ccc0e4a876bbe3e3529f96a52c2f1d7 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihrachys at redhat.com>
Date: Mon, 28 Apr 2014 15:05:30 +0200
Subject: [PATCH] Removed signing_dir from neutron.conf
@@ -14,7 +14,7 @@ Change-Id: Ideb393f9010f4f1706392ccdfdd5fa7307bda070
1 file changed, 1 deletion(-)
diff --git a/etc/neutron.conf b/etc/neutron.conf
-index 775c757..e3ebf74 100644
+index e258720..ce95fc4 100644
--- a/etc/neutron.conf
+++ b/etc/neutron.conf
@@ -398,7 +398,6 @@ auth_protocol = http
diff --git a/0008-Remove-kernel-version-check-for-OVS-VXLAN.patch b/0006-Remove-kernel-version-check-for-OVS-VXLAN.patch
similarity index 94%
rename from 0008-Remove-kernel-version-check-for-OVS-VXLAN.patch
rename to 0006-Remove-kernel-version-check-for-OVS-VXLAN.patch
index 8ca8c9b..5a91d5e 100644
--- a/0008-Remove-kernel-version-check-for-OVS-VXLAN.patch
+++ b/0006-Remove-kernel-version-check-for-OVS-VXLAN.patch
@@ -1,4 +1,4 @@
-From b4ce02e85bcd3d08d02e7e2917fb78429909b92f Mon Sep 17 00:00:00 2001
+From 6338796ad354f7e82945a52ab14914e1fc490ae3 Mon Sep 17 00:00:00 2001
From: Miguel Angel Ajo <mangelajo at redhat.com>
Date: Mon, 26 May 2014 15:56:23 +0200
Subject: [PATCH] Remove kernel version check for OVS VXLAN
@@ -40,17 +40,17 @@ index c6e65e5..5caef4b 100644
self.setup_tunnel_br(tun_br)
# Collect additional bridges to monitor
diff --git a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
-index 11ff682..603a5c7 100644
+index 79c03f1..17906d0 100644
--- a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
+++ b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
-@@ -211,7 +211,6 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
+@@ -212,7 +212,6 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
self.local_ip = local_ip
self.tunnel_count = 0
self.vxlan_udp_port = cfg.CONF.AGENT.vxlan_udp_port
- self._check_ovs_version()
+ self.tun_br = None
if self.enable_tunneling:
self.setup_tunnel_br(tun_br)
- # Collect additional bridges to monitor
diff --git a/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py b/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py
index 71afcd2..9d8e83a 100644
--- a/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py
@@ -92,10 +92,10 @@ index 71afcd2..9d8e83a 100644
min_kernel_ver = OVS_LINUX_KERN_VERS_WITHOUT_VXLAN
install_ver = str(float(min_vxlan_ver) - 0.01)
diff --git a/neutron/tests/unit/openvswitch/test_ovs_lib.py b/neutron/tests/unit/openvswitch/test_ovs_lib.py
-index a9c1b98..647f631 100644
+index dbf155b..77e383a 100644
--- a/neutron/tests/unit/openvswitch/test_ovs_lib.py
+++ b/neutron/tests/unit/openvswitch/test_ovs_lib.py
-@@ -827,31 +827,31 @@ class OVS_Lib_Test(base.BaseTestCase):
+@@ -899,31 +899,31 @@ class OVS_Lib_Test(base.BaseTestCase):
version_ok = False
self.assertEqual(version_ok, expecting_ok)
@@ -132,7 +132,7 @@ index a9c1b98..647f631 100644
min_vxlan_ver = constants.MINIMUM_OVS_VXLAN_VERSION
min_kernel_ver = OVS_LINUX_KERN_VERS_WITHOUT_VXLAN
install_ver = str(float(min_vxlan_ver) - 0.01)
-@@ -860,7 +860,7 @@ class OVS_Lib_Test(base.BaseTestCase):
+@@ -932,7 +932,7 @@ class OVS_Lib_Test(base.BaseTestCase):
min_kernel_ver,
expecting_ok=False)
@@ -142,10 +142,10 @@ index a9c1b98..647f631 100644
min_kernel_ver = constants.MINIMUM_LINUX_KERNEL_OVS_VXLAN
self._check_ovs_vxlan_version(min_vxlan_ver, min_vxlan_ver,
diff --git a/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py b/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py
-index e6eebef..b2f30ab 100644
+index 94d3c93..651c991 100644
--- a/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py
+++ b/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py
-@@ -514,30 +514,30 @@ class TestOvsNeutronAgent(base.BaseTestCase):
+@@ -520,30 +520,30 @@ class TestOvsNeutronAgent(base.BaseTestCase):
version_ok = False
self.assertEqual(version_ok, expecting_ok)
@@ -182,10 +182,10 @@ index e6eebef..b2f30ab 100644
min_kernel_ver = OVS_LINUX_KERN_VERS_WITHOUT_VXLAN
install_ver = str(float(min_vxlan_ver) - 0.01)
diff --git a/neutron/tests/unit/openvswitch/test_ovs_tunnel.py b/neutron/tests/unit/openvswitch/test_ovs_tunnel.py
-index 1940730..809f807 100644
+index 126b9cc..2ae4fe8 100644
--- a/neutron/tests/unit/openvswitch/test_ovs_tunnel.py
+++ b/neutron/tests/unit/openvswitch/test_ovs_tunnel.py
-@@ -247,7 +247,7 @@ class TunnelTest(base.BaseTestCase):
+@@ -249,7 +249,7 @@ class TunnelTest(base.BaseTestCase):
self.VETH_MTU)
self._verify_mock_calls()
diff --git a/0009-Ensure-routing-key-is-specified-in-the-address-for-a.patch b/0007-Ensure-routing-key-is-specified-in-the-address-for-a.patch
similarity index 93%
rename from 0009-Ensure-routing-key-is-specified-in-the-address-for-a.patch
rename to 0007-Ensure-routing-key-is-specified-in-the-address-for-a.patch
index 4dc2051..c852a86 100644
--- a/0009-Ensure-routing-key-is-specified-in-the-address-for-a.patch
+++ b/0007-Ensure-routing-key-is-specified-in-the-address-for-a.patch
@@ -1,4 +1,4 @@
-From 067452a98622461cfa8416f55d90124d919b7b15 Mon Sep 17 00:00:00 2001
+From 9155f7bf00bb50e4988b047e311a2e089e8b8ac9 Mon Sep 17 00:00:00 2001
From: Russell Bryant <rbryant at redhat.com>
Date: Mon, 9 Jun 2014 16:53:21 -0400
Subject: [PATCH] Ensure routing key is specified in the address for a direct
@@ -21,7 +21,7 @@ Related-Bug: #1300318
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/neutron/openstack/common/rpc/impl_qpid.py b/neutron/openstack/common/rpc/impl_qpid.py
-index 6f2a3dc..01e1d64 100644
+index a7dcf29..5fb2c49 100644
--- a/neutron/openstack/common/rpc/impl_qpid.py
+++ b/neutron/openstack/common/rpc/impl_qpid.py
@@ -368,7 +368,7 @@ class DirectPublisher(Publisher):
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index 6e394eb..02fb5b1 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -1,8 +1,8 @@
%global release_name icehouse
Name: openstack-neutron
-Version: 2014.1
-Release: 21%{?dist}
+Version: 2014.1.1
+Release: 1%{?dist}
Provides: openstack-quantum = %{version}-%{release}
Obsoletes: openstack-quantum < 2013.2-0.3.b3
@@ -45,17 +45,15 @@ Source42: neutron-metering-agent.upstart
Source90: neutron-dist.conf
#
-# patches_base=2014.1+1
+# patches_base=2014.1.1+1
#
Patch0001: 0001-use-parallel-installed-versions-in-RHEL6.patch
Patch0002: 0002-Remove-dnsmasq-version-warning.patch
Patch0003: 0003-remove-runtime-dependency-on-pbr.patch
Patch0004: 0004-Sync-service-and-systemd-modules-from-oslo-incubator.patch
Patch0005: 0005-Removed-signing_dir-from-neutron.conf.patch
-Patch0006: 0006-Validate-CIDR-given-as-ip-prefix-in-security-group-r.patch
-Patch0007: 0007-netaddr-0.7.10-raises-ValueError-instead-of-AddrForm.patch
-Patch0008: 0008-Remove-kernel-version-check-for-OVS-VXLAN.patch
-Patch0009: 0009-Ensure-routing-key-is-specified-in-the-address-for-a.patch
+Patch0006: 0006-Remove-kernel-version-check-for-OVS-VXLAN.patch
+Patch0007: 0007-Ensure-routing-key-is-specified-in-the-address-for-a.patch
BuildArch: noarch
@@ -478,8 +476,6 @@ IPSec.
%patch0005 -p1
%patch0006 -p1
%patch0007 -p1
-%patch0008 -p1
-%patch0009 -p1
find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
@@ -537,6 +533,9 @@ mv %{buildroot}/usr/etc/neutron/* %{buildroot}%{_sysconfdir}/neutron
mv %{buildroot}%{_sysconfdir}/neutron/api-paste.ini %{buildroot}%{_datadir}/neutron/api-paste.ini
chmod 640 %{buildroot}%{_sysconfdir}/neutron/plugins/*/*.ini
+# TODO: remove this once the plugin is separately packaged
+rm %{buildroot}%{_sysconfdir}/neutron/plugins/embrane/heleos_conf.ini
+
# Install logrotate
install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-neutron
@@ -992,10 +991,9 @@ fi
%files nuage
%doc LICENSE
-#%doc neutron/plugins/nuage/README
%{python_sitelib}/neutron/plugins/nuage
-#%dir %{_sysconfdir}/neutron/plugins/nuage
-#%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/nuage/*.ini
+%dir %{_sysconfdir}/neutron/plugins/nuage
+%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/nuage/*.ini
%files ofagent
%doc neutron/plugins/ofagent/README
@@ -1103,6 +1101,10 @@ fi
%changelog
+* Fri Jun 13 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2014.1.1-1
+- Update to upstream 2014.1.1
+- Added previously missing ml2_conf_mlnx.ini, bz#1100136
+
* Wed Jun 11 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2014.1-21
- Ensure routing key is specified in the address for a direct producer, bz#1108025
@@ -1131,7 +1133,7 @@ fi
* Wed Apr 23 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2014.1-13
- Removed obsolete setup scripts
-* Mon Apr 23 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2014.1-12
+* Wed Apr 23 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2014.1-12
- Removed signing_dir from neutron.conf
* Tue Apr 22 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2014.1-11
diff --git a/sources b/sources
index 7e82846..c40e227 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7e44f77c8d4704534724b34770e3224f neutron-2014.1.tar.gz
+1d10f3e3f851c0232664b254eabc815a neutron-2014.1.1.tar.gz
More information about the scm-commits
mailing list