From a5040bde6ba1caa3feb3edb061414b3494607b53 Mon Sep 17 00:00:00 2001 From: Ivan Udovichenko Date: Mon, 15 Jun 2015 17:43:02 +0300 Subject: [PATCH] Add -doc package for Ceilometer * Add ceilometer-doc package * Add required dependencies for the ceilometer-doc package generation * Remove docs file All README* files are included by defaul * Add correct branch to .gitreview file * (LP #1460282) Change-Id: I2171ee75be0ed8d287937d6a3a7635aa9475b9de --- .gitreview | 2 +- trusty/debian/ceilometer-doc.doc-base | 9 +++++++++ trusty/debian/changelog | 10 ++++++++++ trusty/debian/control | 24 ++++++++++++++++++++++++ trusty/debian/docs | 1 - trusty/debian/rules | 10 +++++++++- 6 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 trusty/debian/ceilometer-doc.doc-base delete mode 100644 trusty/debian/docs diff --git a/.gitreview b/.gitreview index fb0b841..4ecacf1 100644 --- a/.gitreview +++ b/.gitreview @@ -2,4 +2,4 @@ host=review.fuel-infra.org port=29418 project=openstack-build/ceilometer-build -defaultbranch=master +defaultbranch=openstack-ci/fuel-7.0/2015.1.0 diff --git a/trusty/debian/ceilometer-doc.doc-base b/trusty/debian/ceilometer-doc.doc-base new file mode 100644 index 0000000..49284de --- /dev/null +++ b/trusty/debian/ceilometer-doc.doc-base @@ -0,0 +1,9 @@ +Document: ceilometer-doc +Title: Ceilometer Documentation +Author: OpenStack +Abstract: Sphinx documentation for Ceilometer +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/ceilometer-doc/html/index.html +Files: /usr/share/doc/ceilometer-doc/html/* diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 23667a1..2dd7efc 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,13 @@ +ceilometer (2015.1.0-1~u14.04+mos4) mos7.0; urgency=medium + + * Add ceilometer-doc package + * Add required dependencies for the ceilometer-doc + package generation + * Remove docs file + All README* files are included by default + + -- Ivan Udovichenko Fri, 17 Jul 2015 15:26:55 +0300 + ceilometer (2015.1.0-1~u14.04+mos3) mos7.0; urgency=medium * Remove disable-kafka.patch as of changes which were diff --git a/trusty/debian/control b/trusty/debian/control index 36cbc4f..4f87fb8 100644 --- a/trusty/debian/control +++ b/trusty/debian/control @@ -10,11 +10,14 @@ Build-Depends: pylint, python-all (>= 2.7.1), python-anyjson (>= 0.3.3), + python-awsauth, python-ceilometerclient (>= 1.0.13), python-croniter (>= 0.3.4), python-docutils, + python-elasticsearch (>= 1.3.0), python-eventlet (>= 0.16.1), python-glanceclient (>= 1:0.15.0), + python-happybase, python-iso8601 (>= 0.1.9), python-jsonpath-rw (>=1.2.0), python-jsonschema (>= 2.0.0), @@ -37,6 +40,8 @@ Build-Depends: python-oslo.rootwrap (>= 1.6.0), python-oslo.serialization (>= 1.4.0), python-oslo.utils (>= 1.4.0), + python-oslosphinx (>= 2.5.0), + python-oslo.vmware, python-pastedeploy (>= 1.5.0), python-posix-ipc, python-pbr (>= 0.10), @@ -48,6 +53,10 @@ Build-Depends: python-retrying (>= 1.2.3), python-tz (>= 2013.6), python-six (>= 1.9.0), + python-sphinx, + python-sphinxcontrib-docbookrestapi, + python-sphinxcontrib-httpdomain, + python-sphinxcontrib-pecanwsme, python-sqlalchemy (>= 0.9.7), python-stevedore (>= 1.3.0), python-swiftclient (>= 1:2.2.0), @@ -310,3 +319,18 @@ Description: Ceilometer notification agent (A ceilometer is an instrument that measures cloud coverage.) . This package contains the alarm notifier daemon. + +Package: ceilometer-doc +Section: doc +Architecture: all +Depends: ${misc:Depends}, + ${sphinxdoc:Depends}, +Description: OpenStack efficient metering counters system - doc + Ceilometer aims to deliver a Single Point Of Contact for billing systems, + providing all the counters they need to establish customer billing, across + all current and future OpenStack components. The delivery of counters must be + traceable and auditable, the counters must be easily extensible to support new + projects, and agents doing data collections should be independent of the + overall system. + . + This package contains the documentation. diff --git a/trusty/debian/docs b/trusty/debian/docs deleted file mode 100644 index a1320b1..0000000 --- a/trusty/debian/docs +++ /dev/null @@ -1 +0,0 @@ -README.rst diff --git a/trusty/debian/rules b/trusty/debian/rules index e13a2db..ab614a1 100755 --- a/trusty/debian/rules +++ b/trusty/debian/rules @@ -8,7 +8,7 @@ export HOME="$(CURDIR)/debian/test" include /usr/share/openstack-pkg-tools/pkgos.make %: - dh $@ --with python2,systemd + dh $@ --with python2,systemd,sphinxdoc override_dh_install: oslo-config-generator --output-file etc/ceilometer/ceilometer.conf.sample \ @@ -25,3 +25,11 @@ override_dh_auto_clean: rm -rf .testrepository rm -rf pbr*.egg rm -f debian/*.init debian/*.service debian/*.upstart + +override_dh_sphinxdoc: +ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS))) + PYTHONPATH=. sphinx-build -b html doc/source $(CURDIR)/debian/ceilometer-doc/usr/share/doc/ceilometer-doc/html + mkdir -p $(CURDIR)/debian/ceilometer-doc/usr/share/doc/ceilometer-doc/html/_static + touch $(CURDIR)/debian/ceilometer-doc/usr/share/doc/ceilometer-doc/html/_static/toggle.js + dh_sphinxdoc -O--buildsystem=python_distutils +endif -- 2.32.3