Skip to content

Commit

Permalink
Clean up RPM specfile
Browse files Browse the repository at this point in the history 
Clean up some issues that rpmlint reports back. Also
word wrap large blocks of description to 80 chars for
better looks.

Closes-bug: #1691164

Change-Id: If554fb9e191c5b4d021aff96a6c5e20fd2b29608
Signed-off-by: Leif Madsen <lmadsen@redhat.com>
  • Loading branch information
@leifmadsen
leifmadsen committed Jul 18, 2017
1 parent 25efbc6 commit 6283a9b
Showing 1 changed file with 133 additions and 62 deletions.
195 changes: 133 additions & 62 deletions rpm/contrail/contrail.spec
View file
Expand Up @@ -168,15 +168,24 @@ popd
Summary: Contrail vRouter
Group: Applications/System

Requires: contrail-vrouter-agent >= %{_verstr}-%{_relstr}
Requires: contrail-lib >= %{_verstr}-%{_relstr}
Requires: xmltodict >= 0.7.0
Requires: contrail-vrouter-agent >= %{_verstr}-%{_relstr}
Requires: contrail-lib >= %{_verstr}-%{_relstr}
Requires: xmltodict >= 0.7.0

%description vrouter
vrouter kernel module
The OpenContrail vRouter is a forwarding plane (of a distributed router) that runs in the hypervisor of a virtualized server. It extends the network from the physical routers and switches in a data center into a virtual overlay network hosted in the virtualized servers.
The OpenContrail vRouter is conceptually similar to existing commercial and open source vSwitches such as for example the Open vSwitch (OVS) but it also provides routing and higher layer services (hence vRouter instead of vSwitch).
The package opencontrail-vrouter-dkms provides the OpenContrail Linux kernel module.

The OpenContrail vRouter is a forwarding plane (of a distributed router) that
runs in the hypervisor of a virtualized server. It extends the network from the
physical routers and switches in a data center into a virtual overlay network
hosted in the virtualized servers.

The OpenContrail vRouter is conceptually similar to existing commercial and
open source vSwitches such as for example the Open vSwitch (OVS) but it also
provides routing and higher layer services (hence vRouter instead of vSwitch).

The package opencontrail-vrouter-dkms provides the OpenContrail Linux kernel
module.

%preun vrouter
# Execute only during uninstall, skip during upgrade
Expand Down Expand Up @@ -224,8 +233,17 @@ Group: Applications/System

%description vrouter-source
Contrail vrouter source package
The OpenContrail vRouter is a forwarding plane (of a distributed router) that runs in the hypervisor of a virtualized server. It extends the network from the physical routers and switches in a data center into a virtual overlay network hosted in the virtualized servers. The OpenContrail vRouter is conceptually similar to existing commercial and open source vSwitches such as for example the Open vSwitch (OVS) but it also provides routing and higher layer services (hence vRouter instead of vSwitch).
The package opencontrail-vrouter-source provides the OpenContrail Linux kernel module in source code format.

The OpenContrail vRouter is a forwarding plane (of a distributed router) that
runs in the hypervisor of a virtualized server. It extends the network from the
physical routers and switches in a data center into a virtual overlay network
hosted in the virtualized servers. The OpenContrail vRouter is conceptually
similar to existing commercial and open source vSwitches such as for example
the Open vSwitch (OVS) but it also provides routing and higher layer services
(hence vRouter instead of vSwitch).

The package opencontrail-vrouter-source provides the OpenContrail Linux kernel
module in source code format.

%files vrouter-source
/usr/src/modules/contrail-vrouter
Expand All @@ -235,9 +253,9 @@ Summary: Config openstack

Group: Applications/System

Requires: contrail-config >= %{_verstr}-%{_relstr}
Requires: python-keystoneclient
Requires: python-novaclient
Requires: contrail-config >= %{_verstr}-%{_relstr}
Requires: python-keystoneclient
Requires: python-novaclient

%description config-openstack
Contrail config openstack package
Expand Down Expand Up @@ -268,12 +286,12 @@ Contrail Virtual Router apis package
%package -n python-contrail
Summary: Contrail Python Lib

Group: Applications/System
Obsoletes: contrail-api-lib
Requires: python-kombu
Requires: python-bottle >= 0.11.6
Group: Applications/System
Obsoletes: contrail-api-lib <= 0.0.1
Requires: python-kombu
Requires: python-bottle >= 0.11.6
%if 0%{?rhel} >= 7
Requires: python-gevent >= 1.0
Requires: python-gevent >= 1.0
%endif
%if 0%{?rhel} <= 6
Requires: python-gevent
Expand All @@ -289,7 +307,10 @@ Requires: python-importlib

%description -n python-contrail
Contrail Virtual Router utils package
The VRouter Agent API is used to inform the VRouter agent of the association between local interfaces (e.g. tap/tun or veth) and the interface uuid defined in the OpenContrail API server.

The VRouter Agent API is used to inform the VRouter agent of the association
between local interfaces (e.g. tap/tun or veth) and the interface uuid defined
in the OpenContrail API server.

%files -n python-contrail
%{python_sitelib}/cfgm_common*
Expand All @@ -307,8 +328,12 @@ Group: Applications/System

%description vrouter-utils
Contrail Virtual Router utils package
The OpenContrail vRouter is a forwarding plane (of a distributed router)that runs in the hypervisor of a virtualized server.
The package opencontrail-vrouter-utils provides command line utilities to configure and diagnose the OpenContrail Linux kernel module.

The OpenContrail vRouter is a forwarding plane (of a distributed router)that
runs in the hypervisor of a virtualized server.

The package opencontrail-vrouter-utils provides command line utilities to
configure and diagnose the OpenContrail Linux kernel module.

%files vrouter-utils
%{_bindir}/dropstats
Expand All @@ -335,8 +360,10 @@ Requires: python-paramiko

%description vrouter-agent
Contrail Virtual Router Agent package
OpenContrail is a network virtualization solution that provides an overlay virtual-network to virtual-machines, containers or network namespaces.
This package provides the contrail-vrouter user space agent.

OpenContrail is a network virtualization solution that provides an overlay
virtual-network to virtual-machines, containers or network namespaces. This
package provides the contrail-vrouter user space agent.

%files vrouter-agent
%defattr(-, root, root)
Expand Down Expand Up @@ -384,11 +411,30 @@ Requires: authbind

%description control
Contrail Control package
Control nodes implement the logically centralized portion of the control
plane. Not all control plane functions are logically centralized \u2013 some control plane functions are still implemented in a distributed fashion on the physical and virtual routers and switches in the network. Thecontrol nodes use the IF-MAP protocol to monitor the contents of the low-level technology data model as computed by the configuration nodes thatdescribes the desired state of the network. The control nodes use a combination of south-bound protocols to \u201cmake it so\u201d, i.e. to make the actual state of the network equal to the desired state of the network. In the initial version of the OpenContrail System these south-bound protocols include Extensible Messaging and Presence Protocol (XMPP)to control the OpenContrail vRouters as well as a combination of the Border Gateway Protocol (BGP) and the Network Configuration (Netconf) protocols to control physical routers. The control nodes also use BGP for state
synchronization amongst each other when there are multiple instances of the control node for scale-out and high-availability reasons.
Control nodes implement a logically centralized control plane that is
responsible for maintaining ephemeral network state. Control nodes interact with each other and with network elements to ensure that network state is eventually consistent.

Control nodes implement the logically centralized portion of the control plane.
Not all control plane functions are logically centralized \u2013 some control
plane functions are still implemented in a distributed fashion on the physical
and virtual routers and switches in the network.

The control nodes use the IF-MAP protocol to monitor the contents of the
low-level technology data model as computed by the configuration nodes
thatdescribes the desired state of the network. The control nodes use a
combination of south-bound protocols to \u201cmake it so\u201d, i.e. to make
the actual state of the network equal to the desired state of the network.

In the initial version of the OpenContrail System these south-bound protocols
include Extensible Messaging and Presence Protocol (XMPP)to control the
OpenContrail vRouters as well as a combination of the Border Gateway Protocol
(BGP) and the Network Configuration (Netconf) protocols to control physical
routers. The control nodes also use BGP for state synchronization amongst each
other when there are multiple instances of the control node for scale-out and
high-availability reasons.

Control nodes implement a logically centralized control plane that is
responsible for maintaining ephemeral network state. Control nodes interact
with each other and with network elements to ensure that network state is
eventually consistent.

%files control
%defattr(-,root,root,-)
Expand Down Expand Up @@ -455,7 +501,7 @@ Contrail Virtual Router NetNS package
%package lib
Summary: Libraries used by the Contrail Virtual Router %{?_gitVer}
Group: Applications/System
Obsoletes: contrail-libs
Obsoletes: contrail-libs <= 0.0.1

%description lib
Libraries used by the Contrail Virtual Router.
Expand All @@ -469,34 +515,51 @@ Summary: Contrail Config
Group: Applications/System

BuildArch: noarch
Requires: python-contrail >= %{_verstr}-%{_relstr}
Requires: python-bitarray >= 0.8.0
Requires: python-contrail >= %{_verstr}-%{_relstr}
Requires: python-bitarray >= 0.8.0
%if 0%{?rhel} >= 7
Requires: python-gevent >= 1.0
Requires: python-gevent >= 1.0
%endif
%if 0%{?rhel} <= 6
Requires: python-gevent
%endif
Requires: python-geventhttpclient
Requires: python-lxml >= 2.3.2
Requires: python-pycassa
Requires: python-thrift >= 0.9.1
Requires: python-keystone
Requires: python-psutil >= 0.6.0
Requires: python-requests
Requires: python-zope-interface
Requires: xmltodict >= 0.7.0
Requires: python-jsonpickle
Requires: python-amqp
Requires: python-kazoo >= 1.3.1
Requires: python-ncclient >= 0.3.2
Requires: python-geventhttpclient
Requires: python-lxml >= 2.3.2
Requires: python-pycassa
Requires: python-thrift >= 0.9.1
Requires: python-keystone
Requires: python-psutil >= 0.6.0
Requires: python-requests
Requires: python-zope-interface
Requires: xmltodict >= 0.7.0
Requires: python-jsonpickle
Requires: python-amqp
Requires: python-kazoo >= 1.3.1
Requires: python-ncclient >= 0.3.2

%description config
Contrail Config package
Configuration nodes are responsible for the management layer. The
configuration nodes provide a north-bound Representational State Transfer (REST) Application Programming Interface (API) that can be used to configure the system or extract operational status of the system. The instantiated services are represented by objects in a horizontally scalable database that is described by a formal service data model (more about data models later on). The configuration nodes also contain a transformation engine (sometimes referred to as a compiler) that transforms the objects in the high-level service data model into corresponding more lower-level objects in the technology data model. Whereas the high-level service data model describes what services need to be implemented, the low-level technology data model describes how those services need to be implemented.
The configuration nodes publish the contents of the low-level technology data model to the control nodes using the Interface for Metadata Access Points (IF-MAP) protocol.
Configuration nodes keep a persistent copy of the intended configuration state and translate the high-level data model into the lower level model suitable for interacting with network elements. Both these are kept in a NoSQL database.

Configuration nodes are responsible for the management layer. The configuration
nodes provide a north-bound Representational State Transfer (REST) Application
Programming Interface (API) that can be used to configure the system or extract
operational status of the system. The instantiated services are represented by
objects in a horizontally scalable database that is described by a formal
service data model (more about data models later on).

The configuration nodes also contain a transformation engine (sometimes
referred to as a compiler) that transforms the objects in the high-level
service data model into corresponding more lower-level objects in the
technology data model. Whereas the high-level service data model describes what
services need to be implemented, the low-level technology data model describes
how those services need to be implemented.

The configuration nodes publish the contents of the low-level technology data
model to the control nodes using the Interface for Metadata Access Points
(IF-MAP) protocol. Configuration nodes keep a persistent copy of the intended
configuration state and translate the high-level data model into the lower
level model suitable for interacting with network elements. Both these are kept
in a NoSQL database.

%files config
%defattr(-,contrail,contrail,-)
Expand Down Expand Up @@ -583,10 +646,18 @@ Requires: python-cassandra-driver >= 3.0.0
%description analytics
Contrail Analytics package
Analytics nodes are responsible for collecting, collating and presenting
analytics information for trouble shooting problems and for understanding network usage. Each component of the OpenContrail System generates detailed event records for every significant event in the system. These event records are sent to one of multiple instances (for scale-out) of the analytics node that collate and store the information in a horizontally scalable database using a format that is optimized for time-series analysis and queries.
the analytics nodes have mechanism to automatically trigger the collection of more detailed records when certain event occur; the goal is to be able to get to the root cause of any issue without having to reproduce it. The analytics nodes provide a north-bound analytics query REST API.
Analytics nodes collect, store, correlate, and analyze information from
network elements, virtual or physical. This information includes statistics,logs, events, and errors.
analytics information for trouble shooting problems and for understanding
network usage. Each component of the OpenContrail System generates detailed
event records for every significant event in the system. These event records
are sent to one of multiple instances (for scale-out) of the analytics node
that collate and store the information in a horizontally scalable database
using a format that is optimized for time-series analysis and queries. the
analytics nodes have mechanism to automatically trigger the collection of more
detailed records when certain event occur; the goal is to be able to get to the
root cause of any issue without having to reproduce it. The analytics nodes
provide a north-bound analytics query REST API. Analytics nodes collect, store,
correlate, and analyze information from network elements, virtual or physical.
This information includes statistics,logs, events, and errors.

%files analytics
# Setup directories
Expand Down Expand Up @@ -707,7 +778,7 @@ fi
%{_bindir}/contrail-rndc-confgen
%{_bindir}/contrail-dns
%if 0%{?rhel} > 6
%docdir /usr/lib/python2.7/site-packages/doc/*
%docdir %{python2_sitelib}/doc/*
%endif
%config(noreplace) /etc/contrail/supervisord_control_files/contrail-dns.ini
%config(noreplace) /etc/contrail/supervisord_control_files/contrail-named.ini
Expand All @@ -730,10 +801,10 @@ Contrail Nova Vif driver package
Summary: Contrail utility sctipts.
Group: Applications/System

Requires: lsof
Requires: python-lxml >= 2.3.2
Requires: python-requests
Requires: python-contrail >= %{_verstr}-%{_relstr}
Requires: lsof
Requires: python-lxml >= 2.3.2
Requires: python-requests
Requires: python-contrail >= %{_verstr}-%{_relstr}

%description utils
Contrail utility sctipts package
Expand Down Expand Up @@ -761,9 +832,9 @@ Summary: Kubernetes network manager

Group: Applications/System

Requires: python-contrail >= %{_verstr}-%{_relstr}
Requires: python-gevent
Requires: python-requests
Requires: python-contrail >= %{_verstr}-%{_relstr}
Requires: python-gevent
Requires: python-requests

%description kube-manager
Contrail kubernetes network manager package
Expand Down Expand Up @@ -793,9 +864,9 @@ Summary: Mesos network manager

Group: Applications/System

Requires: python-contrail >= %{_verstr}-%{_relstr}
Requires: python-gevent
Requires: python-requests
Requires: python-contrail >= %{_verstr}-%{_relstr}
Requires: python-gevent
Requires: python-requests

%description mesos-manager
Contrail Mesos network manager package
Expand Down

0 comments on commit 6283a9b

Please sign in to comment.