From e3ea78a03e625e38a3e8c954f3914c9eb42f63d6 Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov Date: Tue, 7 Oct 2014 20:01:44 +0400 Subject: [PATCH] Add ipset package as a dependency to Neutron The ipset package is required for Neutron security groups implementation Related-bug: #1371585 Change-Id: Ib3ecb515b75432e7ce35c6234814dcfe03db9508 --- debian/control | 1 + debian/patches/fix-neutron-configuration.patch | 15 ++++++--------- rpm/SPECS/openstack-neutron.spec | 1 + 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/debian/control b/debian/control index 1607af7ca..73ab255c4 100644 --- a/debian/control +++ b/debian/control @@ -517,6 +517,7 @@ Description: Neutron is a virtual network service for Openstack - ML2 plugin Package: neutron-plugin-openvswitch-agent Architecture: all Depends: + ipset, neutron-plugin-ml2 (= ${source:Version}), openvswitch-switch, ${misc:Depends}, diff --git a/debian/patches/fix-neutron-configuration.patch b/debian/patches/fix-neutron-configuration.patch index 25456d50e..c306a4039 100644 --- a/debian/patches/fix-neutron-configuration.patch +++ b/debian/patches/fix-neutron-configuration.patch @@ -1,8 +1,8 @@ diff --git a/etc/neutron.conf b/etc/neutron.conf -index 31977a8..62a0e14 100644 +index 0e61cf7..c5aca0f 100644 --- a/etc/neutron.conf +++ b/etc/neutron.conf -@@ -50,7 +50,7 @@ lock_path = $state_path/lock +@@ -60,7 +60,7 @@ lock_path = $state_path/lock # previous versions, the class name of a plugin can be specified instead of its # entrypoint name. # @@ -11,16 +11,16 @@ index 31977a8..62a0e14 100644 # Example: core_plugin = ml2 # (ListOpt) List of service plugin entrypoints to be loaded from the -@@ -389,7 +389,7 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier +@@ -548,7 +548,7 @@ lock_path = $state_path/lock # Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real # root filter facility. # Change to "sudo" to skip the filtering and just run the comand directly -# root_helper = sudo +root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf - # =========== items for agent management extension ============= - # seconds between nodes reporting state to server; should be less than -@@ -412,7 +412,7 @@ admin_password = %SERVICE_PASSWORD% + # Set to true to add comments to generated iptables rules that describe + # each rule's purpose. (System must support the iptables comments module.) +@@ -575,7 +575,7 @@ admin_password = %SERVICE_PASSWORD% # connection = mysql://root:pass@127.0.0.1:3306/neutron # Replace 127.0.0.1 above with the IP address of the database used by the # main neutron server. (Leave it as is if the database runs on this host.) @@ -29,6 +29,3 @@ index 31977a8..62a0e14 100644 # NOTE: In deployment the [database] section and its connection attribute may # be set in the corresponding core plugin '.ini' file. However, it is suggested # to put the [database] section and its connection attribute in this --- -2.0.0 - diff --git a/rpm/SPECS/openstack-neutron.spec b/rpm/SPECS/openstack-neutron.spec index f6abfe415..2c5260349 100644 --- a/rpm/SPECS/openstack-neutron.spec +++ b/rpm/SPECS/openstack-neutron.spec @@ -65,6 +65,7 @@ BuildRequires: dos2unix BuildRequires: python-pbr BuildRequires: python-d2to1 +Requires: ipset Requires: dnsmasq-utils Requires: python-neutron = %{version}-%{release} Requires: python-oslo-rootwrap -- 2.32.3