%global service neutron
-Name: openstack-%{service}
-Version: 8.0.0.0b2
-Release: 1%{?dist}~mos2
-Epoch: 1
-Summary: OpenStack Networking Service
-
-License: ASL 2.0
-URL: http://launchpad.net/%{service}/
-
-Source0: %{service}-%{version}.tar.gz
-Source1: %{service}.logrotate
-Source2: %{service}-sudoers
-Source10: neutron-server.service
-Source11: neutron-linuxbridge-agent.service
-Source12: neutron-openvswitch-agent.service
-Source13: neutron-bgp-dragent.service
-Source15: neutron-dhcp-agent.service
-Source16: neutron-l3-agent.service
-Source17: neutron-metadata-agent.service
-Source18: neutron-ovs-cleanup.service
-Source20: neutron-metering-agent.service
-Source21: neutron-sriov-nic-agent.service
-Source22: neutron-netns-cleanup.service
-Source23: neutron-netns-cleanup.init
-Source24: neutron-ovs-cleanup.init
-Source29: neutron-rpc-server.service
-
-Source31: conf.README
-Source32: neutron-linuxbridge-cleanup.service
-
-BuildArch: noarch
+Name: openstack-%{service}
+Version: 9.0.0~b3
+Release: 1%{?dist}
+Epoch: 1
+Summary: OpenStack Networking Service
+
+License: ASL 2.0
+URL: http://launchpad.net/%{service}/
+
+Source0: %{service}-%{version}.tar.gz
+Source1: %{service}.logrotate
+Source2: %{service}-sudoers
+Source10: neutron-server.service
+Source11: neutron-linuxbridge-agent.service
+Source12: neutron-openvswitch-agent.service
+Source15: neutron-dhcp-agent.service
+Source16: neutron-l3-agent.service
+Source17: neutron-metadata-agent.service
+Source18: neutron-ovs-cleanup.service
+Source19: neutron-macvtap-agent.service
+Source20: neutron-metering-agent.service
+Source21: neutron-sriov-nic-agent.service
+Source22: neutron-netns-cleanup.service
+Source23: neutron-netns-cleanup.init
+Source24: neutron-ovs-cleanup.init
+Source29: neutron-rpc-server.service
+Source31: conf.README
+Source32: neutron-linuxbridge-cleanup.service
+
+BuildArch: noarch
BuildRequires: git
-BuildRequires: python-backports-ssl_match_hostname
BuildRequires: python2-devel
BuildRequires: python-d2to1
-BuildRequires: python-keystoneauth1 >= 2.1.0
+BuildRequires: python-keystoneauth1 >= 2.10.0
BuildRequires: python-keystonemiddleware
-BuildRequires: python-neutron-lib
+BuildRequires: python-neutron-lib >= 0.4.0
BuildRequires: python-novaclient
+BuildRequires: python-oslo-cache
BuildRequires: python-oslo-concurrency
BuildRequires: python-oslo-config
BuildRequires: python-oslo-db
BuildRequires: python-oslo-policy
BuildRequires: python-oslo-rootwrap
BuildRequires: python-oslo-service
-BuildRequires: python-pbr
+BuildRequires: python-oslo-versionedobjects
+BuildRequires: python-osprofiler >= 1.4.0
+BuildRequires: python-pbr >= 1.6
BuildRequires: python-pecan
BuildRequires: python-setuptools
BuildRequires: systemd-units
-Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release}
+Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release}
# dnsmasq is not a hard requirement, but is currently the only option
# when neutron-dhcp-agent is deployed.
-Requires: dnsmasq
-Requires: dnsmasq-utils
+Requires: dnsmasq
+Requires: dnsmasq-utils
# radvd is not a hard requirement, but is currently the only option
# for IPv6 deployments.
-Requires: radvd
+Requires: radvd
# dibbler is not a hard requirement, but is currently the default option
# for IPv6 prefix delegation.
-#Requires: dibbler-client
+#Requires: dibbler-client
# conntrack is not a hard requirement, but is currently used by L3 agent
# to immediately drop connections after a floating IP is disassociated
-Requires: conntrack-tools
+Requires: conntrack-tools
# keepalived is not a hard requirement, but is currently used by DVR L3
# agent
-Requires: keepalived
+Requires: keepalived
# those are not hard requirements, but are used to implement firewall
# drivers.
-Requires: ipset
-Requires: iptables
+Requires: ipset
+Requires: iptables
Requires(pre): shadow-utils
Requires(post): systemd
%package -n python-%{service}
-Summary: Neutron Python libraries
-Requires: python-alembic >= 0.8.0
-Requires: python-debtcollector >= 0.3.0
-Requires: python-eventlet >= 0.17.4
-Requires: python-greenlet >= 0.3.2
-Requires: python-httplib2 >= 0.7.5
-Requires: python-jinja2 >= 2.6
-Requires: python-keystoneauth1 >= 2.1.0
-Requires: python-keystoneclient >= 1.6.0
-Requires: python-keystonemiddleware >= 2.0.0
-Requires: python-netaddr >= 0.7.12
-Requires: python-neutronclient >= 2.6.0
-Requires: python-neutron-lib
-Requires: python-novaclient >= 2.26.0
-Requires: python-openvswitch
-Requires: python-oslo-concurrency >= 2.3.0
-Requires: python-oslo-config >= 2:2.1.0
-Requires: python-oslo-context >= 0.2.0
-Requires: python-oslo-db >= 2.0
-Requires: python-oslo-i18n >= 1.5.0
-Requires: python-oslo-log >= 1.8.0
-Requires: python-oslo-messaging >= 1.16.0
-Requires: python-oslo-middleware >= 2.4.0
-Requires: python-oslo-policy >= 0.5.0
-Requires: python-oslo-reports >= 0.6.0
-Requires: python-oslo-rootwrap >= 2.0.0
-Requires: python-oslo-serialization >= 1.4.0
-Requires: python-oslo-service >= 0.6.0
-Requires: python-oslo-utils >= 2.0.0
-Requires: python-oslo-versionedobjects >= 0.6.0
-Requires: python-oslo-context >= 0.2.0
-Requires: python-paste
-Requires: python-paste-deploy >= 1.5.0
-Requires: python-pecan >= 1.0.0
-Requires: python-pbr
-Requires: python-pyroute2
-Requires: python-requests >= 2.5.2
-Requires: python-retrying >= 1.2.3
-Requires: python-routes >= 1.12.3
-Requires: python-ryu >= 3.23.2
-Requires: python-six >= 1.9.0
-Requires: python-sqlalchemy >= 1.0.10
-Requires: python-stevedore >= 1.5.0
-Requires: python-webob >= 1.2.3
-Requires: python-unicodecsv
+Summary: Neutron Python libraries
+Requires: python-alembic >= 0.8.4
+Requires: python-debtcollector >= 1.2.0
+Requires: python-designateclient >= 1.5.0
+Requires: python-eventlet >= 0.18.2
+Requires: python-greenlet >= 0.3.2
+Requires: python-httplib2 >= 0.7.5
+Requires: python-jinja2 >= 2.8
+Requires: python-keystoneauth1 >= 2.10.0
+Requires: python-keystonemiddleware >= 4.0.0
+Requires: python-netaddr >= 0.7.12
+Requires: python-netifaces >= 0.10.4
+Requires: python-neutronclient >= 5.1.0
+Requires: python-neutron-lib >= 0.4.0
+Requires: python-novaclient >= 2.29.0
+Requires: python-openvswitch
+Requires: python-oslo-cache >= 1.5.0
+Requires: python-oslo-concurrency >= 3.8.0
+Requires: python-oslo-config >= 2:3.14.0
+Requires: python-oslo-context >= 2.9.0
+Requires: python-oslo-db >= 4.10.0
+Requires: python-oslo-i18n >= 2.1.0
+Requires: python-oslo-log >= 1.14.0
+Requires: python-oslo-messaging >= 5.2.0
+Requires: python-oslo-middleware >= 3.0.0
+Requires: python-oslo-policy >= 1.9.0
+Requires: python-oslo-reports >= 0.6.0
+Requires: python-oslo-rootwrap >= 5.0.0
+Requires: python-oslo-serialization >= 1.10.0
+Requires: python-oslo-service >= 1.10.0
+Requires: python-oslo-utils >= 3.16.0
+Requires: python-oslo-versionedobjects >= 1.13.1
+Requires: python-osprofiler >= 1.4.0
+Requires: python-paste
+Requires: python-paste-deploy >= 1.5.0
+Requires: python-pecan >= 1.0.0
+Requires: python-pbr >= 1.6
+Requires: python-pyroute2
+Requires: python-requests >= 2.10.0
+Requires: python-retrying >= 1.2.3
+Requires: python-routes >= 1.12.3
+Requires: python-ryu >= 3.30
+Requires: python-six >= 1.9.0
+Requires: python-sqlalchemy >= 1.0.10
+Requires: python-stevedore >= 1.16.0
+Requires: python-webob >= 1.2.3
%package -n python-%{service}-tests
-Summary: Neutron tests
-Requires: openstack-%{service} = %{epoch}:%{version}-%{release}
+Summary: Neutron tests
+Requires: python-%{service} = %{epoch}:%{version}-%{release}
+Requires: python-ddt
%description -n python-%{service}-tests
%package common
-Summary: Neutron common files
-Requires: python-%{service} = %{epoch}:%{version}-%{release}
-Requires: sudo
+Summary: Neutron common files
+Requires(pre): shadow-utils
+Requires: python-%{service} = %{epoch}:%{version}-%{release}
+Requires: sudo
%description common
This package contains Neutron common files.
-%package bgp-dragent
-Summary: Neutron BGP Dynamic Routing agent
+%package linuxbridge
+Summary: Neutron Linuxbridge agent
+Requires: bridge-utils
+Requires: ebtables
+Requires: ipset
+Requires: iptables
Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release}
-%description bgp-dragent
+%description linuxbridge
Neutron provides an API to dynamically request and configure virtual
networks.
-This package contains the Neutron BGP Dynamic Routing agent that will host
-different BGP speaking drivers and makes the required BGP peering session/s for
-Neutron.
+This package contains the Neutron agent that implements virtual
+networks using VLAN or VXLAN using Linuxbridge technology.
-%package linuxbridge
-Summary: Neutron linuxbridge plugin
-Requires: bridge-utils
-Requires: ebtables
-Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release}
+%package macvtap-agent
+Summary: Neutron macvtap agent
+Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release}
-%description linuxbridge
+%description macvtap-agent
Neutron provides an API to dynamically request and configure virtual
networks.
-This package contains the Neutron plugin that implements virtual
-networks as VLANs using Linux bridging.
+This package contains the Neutron agent that implements
+macvtap attachments for libvirt qemu/kvm instances.
%package ml2
-Summary: Neutron ML2 plugin
-Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release}
+Summary: Neutron ML2 plugin
+Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release}
# needed for brocade and cisco drivers
-Requires: python-ncclient
+Requires: python-ncclient
%description ml2
%package openvswitch
-Summary: Neutron openvswitch plugin
-Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release}
+Summary: Neutron openvswitch plugin
+Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release}
# We require openvswitch when using vsctl to access ovsdb;
# but if we use native access, then we just need python bindings.
# since we don't know what users actually use, we depend on both.
-Requires: openvswitch
-Requires: python-openvswitch
+Requires: ipset
+Requires: iptables
+Requires: openvswitch
+Requires: python-openvswitch
%description openvswitch
%package metering-agent
-Summary: Neutron bandwidth metering agent
-Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release}
+Summary: Neutron bandwidth metering agent
+Requires: iptables
+Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release}
%description metering-agent
%package rpc-server
-Summary: Neutron (RPC only) Server
-Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release}
+Summary: Neutron (RPC only) Server
+Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release}
%description rpc-server
%package sriov-nic-agent
-Summary: Neutron SR-IOV NIC agent
-Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release}
+Summary: Neutron SR-IOV NIC agent
+Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release}
%description sriov-nic-agent
SR-IOV network cards.
-%package macvtap-agent
-Summary: Neutron Macvtap L2 Agent
-Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release}
-
-
-%description macvtap-agent
-Neutron supports macvtap ml2 driver
-
-This package contains the Neutron agent to support macvtap attachments for
-libvirt qemu/kvm instances.
-
-
%package doc
Summary: Documentation for OpenStack Neutron
Group: Documentation
BuildRequires: python-sphinx
BuildRequires: python-oslo-sphinx
-BuildRequires: python-alembic >= 0.8.0
-BuildRequires: python-debtcollector >= 0.3.0
-BuildRequires: python-eventlet >= 0.17.4
-BuildRequires: python-greenlet >= 0.3.2
-BuildRequires: python-httplib2 >= 0.7.5
-BuildRequires: python-jinja2 >= 2.6
-BuildRequires: python-keystoneclient >= 1:1.6.0
-BuildRequires: python-keystonemiddleware >= 2.0.0
-BuildRequires: python-netaddr >= 0.7.12
-BuildRequires: python-neutronclient >= 2.6.0
-BuildRequires: python-novaclient >= 1:2.26.0
-BuildRequires: python-oslo-concurrency >= 2.3.0
-BuildRequires: python-oslo-config >= 2:2.1.0
-BuildRequires: python-oslo-context >= 0.2.0
-BuildRequires: python-oslo-db >= 2.0
-BuildRequires: python-oslo-i18n >= 1.5.0
-BuildRequires: python-oslo-log >= 1.8.0
-BuildRequires: python-oslo-messaging >= 1.16.0
-BuildRequires: python-oslo-middleware >= 2.4.0
-BuildRequires: python-oslo-policy >= 0.5.0
-BuildRequires: python-oslo-rootwrap >= 2.0.0
-BuildRequires: python-oslo-serialization >= 1.4.0
-BuildRequires: python-oslo-service >= 0.6.0
-BuildRequires: python-oslo-utils >= 2.0.0
-BuildRequires: python-oslo-versionedobjects >= 0.6.0
-BuildRequires: python-oslo-context >= 0.2.0
+BuildRequires: python-alembic
+BuildRequires: python-debtcollector
+BuildRequires: python-eventlet
+BuildRequires: python-greenlet
+BuildRequires: python-httplib2
+BuildRequires: python-jinja2
+BuildRequires: python-keystoneclient
+BuildRequires: python-keystonemiddleware
+BuildRequires: python-netaddr
+BuildRequires: python-neutronclient
+BuildRequires: python-novaclient
+BuildRequires: python-oslo-concurrency
+BuildRequires: python-oslo-config
+BuildRequires: python-oslo-context
+BuildRequires: python-oslo-db
+BuildRequires: python-oslo-i18n
+BuildRequires: python-oslo-log
+BuildRequires: python-oslo-messaging
+BuildRequires: python-oslo-middleware
+BuildRequires: python-oslo-policy
+BuildRequires: python-oslo-rootwrap
+BuildRequires: python-oslo-serialization
+BuildRequires: python-oslo-service
+BuildRequires: python-oslo-utils
+BuildRequires: python-oslo-versionedobjects
+BuildRequires: python-oslo-context
BuildRequires: python-paste
-BuildRequires: python-paste-deploy >= 1.5.0
-BuildRequires: python-pecan >= 1.0.0
+BuildRequires: python-paste-deploy
+BuildRequires: python-pecan
BuildRequires: python-pbr
-BuildRequires: python-pyroute2
-BuildRequires: python-requests >= 2.5.2
-BuildRequires: python-retrying >= 1.2.3
-BuildRequires: python-routes >= 1.12.3
-BuildRequires: python-six >= 1.9.0
-BuildRequires: python-sqlalchemy >= 0.9.7
-BuildRequires: python-stevedore >= 1.5.0
-BuildRequires: python-webob >= 1.2.3
+BuildRequires: python-requests
+BuildRequires: python-retrying
+BuildRequires: python-routes
+BuildRequires: python-six
+BuildRequires: python-sqlalchemy
+BuildRequires: python-stevedore
+BuildRequires: python-webob
BuildRequires: python-testresources
BuildRequires: python-testscenarios
BuildRequires: python-oslotest
%build
export SKIP_PIP_INSTALL=1
%{__python2} setup.py build
+# Generate i18n files
+%{__python2} setup.py compile_catalog -d build/lib/%{service}/locale
# Generate configuration files
PYTHONPATH=. tools/generate_config_file_samples.sh
install -p -D -m 644 %{SOURCE10} %{buildroot}%{_unitdir}/neutron-server.service
install -p -D -m 644 %{SOURCE11} %{buildroot}%{_unitdir}/neutron-linuxbridge-agent.service
install -p -D -m 644 %{SOURCE12} %{buildroot}%{_unitdir}/neutron-openvswitch-agent.service
-install -p -D -m 644 %{SOURCE13} %{buildroot}%{_unitdir}/neutron-bgp-dragent.service
install -p -D -m 644 %{SOURCE15} %{buildroot}%{_unitdir}/neutron-dhcp-agent.service
install -p -D -m 644 %{SOURCE16} %{buildroot}%{_unitdir}/neutron-l3-agent.service
install -p -D -m 644 %{SOURCE17} %{buildroot}%{_unitdir}/neutron-metadata-agent.service
install -p -D -m 644 %{SOURCE18} %{buildroot}%{_unitdir}/neutron-ovs-cleanup.service
+install -p -D -m 644 %{SOURCE19} %{buildroot}%{_unitdir}/neutron-macvtap-agent.service
install -p -D -m 644 %{SOURCE20} %{buildroot}%{_unitdir}/neutron-metering-agent.service
install -p -D -m 644 %{SOURCE21} %{buildroot}%{_unitdir}/neutron-sriov-nic-agent.service
install -p -D -m 644 %{SOURCE22} %{buildroot}%{_unitdir}/neutron-netns-cleanup.service
# Create configuration directories for all services that can be populated by users with custom *.conf files
mkdir -p %{buildroot}/%{_sysconfdir}/%{service}/conf.d/common
-for service in server rpc-server ovs-cleanup netns-cleanup linuxbridge-cleanup bgp-dragent; do
+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; do
mkdir -p %{buildroot}/%{_sysconfdir}/%{service}/conf.d/%{service}-$service-agent
done
+# Install i18n .mo files (.po and .pot are not required)
+install -d -m 755 %{buildroot}%{_datadir}
+rm -f %{buildroot}%{python2_sitelib}/%{service}/locale/*/LC_*/%{service}*po
+rm -f %{buildroot}%{python2_sitelib}/%{service}/locale/*pot
+mv %{buildroot}%{python2_sitelib}/%{service}/locale %{buildroot}%{_datadir}/locale
+
+# Find language files
+%find_lang %{service} --all-name
%pre common
getent group %{service} >/dev/null || groupadd -r %{service}
%systemd_postun_with_restart neutron-server.service
-%post bgp-dragent
-%systemd_post neutron-bgp-dragent.service
+%post macvtap-agent
+%systemd_post neutron-macvtap-agent.service
-%preun bgp-dragent
-%systemd_preun neutron-bgp-dragent.service
+%preun macvtap-agent
+%systemd_preun neutron-macvtap-agent.service
-%postun bgp-dragent
-%systemd_postun_with_restart neutron-bgp-dragent.service
+%postun macvtap-agent
+%systemd_postun_with_restart neutron-macvtap-agent.service
%post linuxbridge
%exclude %{python2_sitelib}/%{service}/tests
-%files common
+%files common -f %{service}.lang
%license LICENSE
%doc README.rst
%{_bindir}/neutron-rootwrap
%{_datarootdir}/%{service}/rootwrap/l3.filters
-%files bgp-dragent
-%license LICENSE
-%{_bindir}/neutron-bgp-dragent
-%{_unitdir}/neutron-bgp-dragent.service
-%dir %{_sysconfdir}/%{service}/conf.d/%{service}-bgp-dragent
-
-
%files linuxbridge
%license LICENSE
%{_bindir}/neutron-linuxbridge-agent
%dir %{_sysconfdir}/%{service}/conf.d/%{service}-linuxbridge-agent
+%files macvtap-agent
+%license LICENSE
+%{_bindir}/neutron-macvtap-agent
+%{_unitdir}/neutron-macvtap-agent.service
+%dir %{_sysconfdir}/%{service}/conf.d/%{service}-macvtap-agent
+
+
%files ml2
%license LICENSE
%doc %{service}/plugins/ml2/README
%dir %{_sysconfdir}/%{service}/conf.d/%{service}-sriov-nic-agent
-%files macvtap-agent
-%license LICENSE
-%{_bindir}/neutron-macvtap-agent
-
-
%files doc
%license LICENSE
%doc html
%changelog
+* Fri Sep 9 2016 Jerzy Mikolajczak <jmikolajczak@mirantis.com> 1:9.0.0~b3-1.el7
+- Update specs for Newton b3 release
+* Tue Aug 16 2016 Jerzy Mikolajczak <jmikolajczak@mirantis.com> 1:9.0.0~b2-3.el7
+- Update requirements
+* Wed Jul 19 2016 Jerzy Mikolajczak <jmikolajczak@mirantis.com> 1:9.0.0~b2-2.el7
+- Update specs for Newton b2 release
+* Mon Jul 18 2016 Sergey Kolekonov <skolekonov@mirantis.com> 1:9.0.0~b2-1.el7
+- Add Restart=always directive for systemd units
+* Mon Jun 27 2016 Jerzy Mikolajczak <jmikolajczak@mirantis.com> 1:9.0.0.0b1-1.el7
+- Update specs for Newton b1 release
+- Remove neutron-bgp-dragent service
+* Fri Apr 8 2016 Jerzy Mikolajczak <jmikolajczak@mirantis.com> 1:8.0.0-1%{?dist}~mos1
+- Update specs for Mitaka Final release
+* Sun Mar 6 2016 Sergey Kolekonov <skolekonov@mirantis.com> 1:8.0.0.0b3-1.el7
+- Rebuild for Mitaka-b3
* Thu Feb 25 2016 Jerzy Mikolajczak <jmikolajczak@mirantis.com> 1:8.0.0.0b2-1%{?dist}~mos2
- Update specs for Mitaka release
- Remove vendor specific subpackages (mellanox, bigswitch, cisco, etc)
Code Review / openstack-build / neutron-build.git / blobdiff