%global service neutron
Name: openstack-%{service}
-Version: 8.0.0.0b2
-Release: 1%{?dist}~mos2
+Version: 8.0.0.0b3
+Release: 1%{?dist}
Epoch: 1
Summary: OpenStack Networking 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
%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-debtcollector >= 1.2.0
+Requires: python-eventlet >= 0.18.2
Requires: python-greenlet >= 0.3.2
Requires: python-httplib2 >= 0.7.5
-Requires: python-jinja2 >= 2.6
+Requires: python-jinja2 >= 2.8
Requires: python-keystoneauth1 >= 2.1.0
Requires: python-keystoneclient >= 1.6.0
-Requires: python-keystonemiddleware >= 2.0.0
+Requires: python-keystonemiddleware >= 4.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-novaclient >= 2.29.0
Requires: python-openvswitch
-Requires: python-oslo-concurrency >= 2.3.0
-Requires: python-oslo-config >= 2:2.1.0
+Requires: python-oslo-concurrency >= 3.5.0
+Requires: python-oslo-config >= 2:3.7.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-db >= 4.1.0
+Requires: python-oslo-i18n >= 2.1.0
+Requires: python-oslo-log >= 1.14.0
+Requires: python-oslo-messaging >= 4.0.0
+Requires: python-oslo-middleware >= 3.0.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-serialization >= 1.10.0
+Requires: python-oslo-service >= 1.0.0
+Requires: python-oslo-utils >= 3.5.0
+Requires: python-oslo-versionedobjects >= 1.5.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-requests >= 2.8.1
Requires: python-retrying >= 1.2.3
Requires: python-routes >= 1.12.3
-Requires: python-ryu >= 3.23.2
+Requires: python-ryu >= 3.30
Requires: python-six >= 1.9.0
Requires: python-sqlalchemy >= 1.0.10
Requires: python-stevedore >= 1.5.0
networks as VLANs using Linux bridging.
+%package macvtap-agent
+Summary: Neutron macvtap agent
+Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release}
+
+
+%description macvtap-agent
+Neutron provides an API to dynamically request and configure virtual
+networks.
+
+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}
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
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 bgp-dragent 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
%systemd_postun_with_restart neutron-bgp-dragent.service
+%post macvtap-agent
+%systemd_post neutron-macvtap-agent.service
+
+
+%preun macvtap-agent
+%systemd_preun neutron-macvtap-agent.service
+
+
+%postun macvtap-agent
+%systemd_postun_with_restart neutron-macvtap-agent.service
+
+
%post linuxbridge
%systemd_post neutron-linuxbridge-agent.service
oldconf=%{_sysconfdir}/%{service}/plugins/linuxbridge/linuxbridge_conf.ini
%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
+* 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)