Added doc package for Neutron LBaaS

* debian/control:
  - Add neutron-lbaas-doc package section
  - Add python-sphinx, python-oslosphinx to build dependencies
* debian/rules:
  - Add sphinxdoc to build with
  - Add override_dh_sphinxdoc section
* Add missing call to setup_rabbitmq function in tests

Change-Id: I607e4d74f4b77fb6b1092fbca1ffa7440bc115ff
Related-Bug: #1460282

diff --git a/tests/runtests.sh b/tests/runtests.sh
index 3cee2c1a7fd8ff4114e3eaf5691eb3d063eea9b0..c43395371e8e046249eefe23c94c1e64631aec5d 100755 (executable)
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -223,6 +223,7 @@ case $PACKAGE in
     setup_keystone
     setup_neutron_services
     upgrade_neutron_db
+    setup_rabbitmq
     start_neutron_server
     try check_neutron_lbaas_agent
     try check_neutron_lbaas
@@ -230,4 +231,4 @@ case $PACKAGE in
   ;;
 esac
 
-exit 0
\ No newline at end of file
+exit 0

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 055681206218ba67ad0390c1cb022a089fe36e57..37e24fd7093295d322826de330f32459f69dc67c 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,14 @@
+neutron-lbaas (1:2015.1.0-1~u14.04+mos3) mos7.0; urgency=medium
+
+  * debian/control:
+    - Add neutron-lbaas-doc package section
+    - Add python-sphinx, python-oslosphinx to build dependencies
+  * debian/rules:
+    - Add sphinxdoc to build with
+    - Add override_dh_sphinxdoc section
+
+ -- Sergey Kolekonov <skolekonov@mirantis.com>  Mon, 13 Jul 2015 15:16:54 +0300
+
 neutron-lbaas (1:2015.1.0-1~u14.04+mos2) mos7.0; urgency=medium
 
   * Fix python-oslo-* naming scheme

diff --git a/trusty/debian/control b/trusty/debian/control
index 52c3d80858f926071c96e92af468d3a25559119e..0150b0dfe8d8da5ccf900bd614f05ee1cd6e3f97 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -28,6 +28,7 @@ Build-Depends-Indep:
  python-oslo.messaging (>= 1.8.0),
  python-oslo.rootwrap (>= 1.6.0),
  python-oslo.serialization (>= 1.4.0),
+ python-oslosphinx (>= 2.5.0),
  python-oslo.utils (>= 1.4.0),
  python-oslotest (>= 1.5.1),
  python-pbr (>= 0.10),
@@ -37,6 +38,7 @@ Build-Depends-Indep:
  python-requests-mock (>= 0.6.0),
  python-setuptools,
  python-six (>= 1.9.0),
+ python-sphinx (>= 1.1.2),
  python-sqlalchemy (>= 0.9.7),
  python-stevedore (>= 1.3.0),
  python-subunit (>= 0.0.18),
@@ -83,3 +85,19 @@ Description: Neutron is a virtual network service for Openstack - LBaaS agent
  etc.)
  .
  This package provides the Load Balancing as-a Service (LBaaS) agent.
+
+Package: neutron-lbaas-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Description: Loadbalancer-as-a-Service driver for OpenStack Neutron
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package contains the documentation

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 56240be55cd338a9cc465096e6ed6e14f725b406..f254eae71208100c94a0958f7d2e0b36c0758cdc 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -6,7 +6,7 @@
 include /usr/share/openstack-pkg-tools/pkgos.make
 
 %:
-       dh $@ --with python2,systemd --buildsystem=python_distutils
+       dh $@ --with python2,systemd,sphinxdoc --buildsystem=python_distutils
 
 # NOTE(jamespage): Some tests need access to /etc/neutron/neutron.conf,
 #                  skip these as this file will contain access credentials
@@ -29,3 +29,10 @@ override_dh_auto_clean:
        dh_auto_clean
        rm -rf .testrepository
        rm -f debian/*.upstart debian/*.init debian/*.service
+
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+       python setup.py build_sphinx
+       cp -rf doc/build/html $(CURDIR)/debian/neutron-lbaas-doc/usr/share/doc/neutron-lbaas-doc
+       dh_sphinxdoc -O--buildsystem=python_distutils
+endif