From: Oleg S. Gelbukh Date: Tue, 23 Apr 2013 07:54:15 +0000 (+0400) Subject: Initial commit: add debian/ directory X-Git-Tag: 2014.1~18 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1946357f3212070b54042497775f4b55f2aafb3d;p=openstack-build%2Fceilometer-build.git Initial commit: add debian/ directory Add debian spec directory to build branch for version 2013.1 --- 1946357f3212070b54042497775f4b55f2aafb3d diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..ca0ec7d --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,2 @@ +In order to configure both the agents and collector you have to put notification_topics 'notifications,glance_notifications' +in your /etc/nova/nova.conf. diff --git a/debian/ceilometer-agent-central.install b/debian/ceilometer-agent-central.install new file mode 100644 index 0000000..0902295 --- /dev/null +++ b/debian/ceilometer-agent-central.install @@ -0,0 +1 @@ +usr/bin/ceilometer-agent-central diff --git a/debian/ceilometer-agent-central.postrm b/debian/ceilometer-agent-central.postrm new file mode 100644 index 0000000..a8c06b6 --- /dev/null +++ b/debian/ceilometer-agent-central.postrm @@ -0,0 +1,7 @@ +#!/bin/sh -e + +if [ "$1" = purge ]; then + update-rc.d ceilometer-agent-central remove +fi + +#DEBHELPER# diff --git a/debian/ceilometer-agent-central.upstart b/debian/ceilometer-agent-central.upstart new file mode 100644 index 0000000..e88d6ca --- /dev/null +++ b/debian/ceilometer-agent-central.upstart @@ -0,0 +1,17 @@ +description "ceilometer-agent-compute" +author "Chuck Short " + +start on runlevel [2345] +stop on runlelvel [!2345] + +chdir /var/run + +pre-start script + mkdir -p /var/run/ceilometer + chown ceilometer:ceilometer /var/run/ceilometer + + mkdir -p /var/lock/ceilometer + chown ceilometer:ceilometer /var/lock/ceilometer +end script + +exec start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-agent-central diff --git a/debian/ceilometer-agent-compute.install b/debian/ceilometer-agent-compute.install new file mode 100644 index 0000000..773283a --- /dev/null +++ b/debian/ceilometer-agent-compute.install @@ -0,0 +1 @@ +usr/bin/ceilometer-agent-compute diff --git a/debian/ceilometer-agent-compute.postrm b/debian/ceilometer-agent-compute.postrm new file mode 100644 index 0000000..1ef9152 --- /dev/null +++ b/debian/ceilometer-agent-compute.postrm @@ -0,0 +1,7 @@ +#!/bin/sh -e + +if [ "$1" = purge ]; then + update-rc.d ceilometer-agent-compute remove +fi + +#DEBHELPER# diff --git a/debian/ceilometer-agent-compute.upstart b/debian/ceilometer-agent-compute.upstart new file mode 100644 index 0000000..86aaf89 --- /dev/null +++ b/debian/ceilometer-agent-compute.upstart @@ -0,0 +1,17 @@ +description "ceilometer-agent-compute" +author "Chuck Short " + +start on runlevel [2345] +stop on runlelvel [!2345] + +chdir /var/run + +pre-start script + mkdir -p /var/run/ceilometer + chown ceilometer:ceilometer /var/run/ceilometer + + mkdir -p /var/lock/ceilometer + chown ceilometer:ceilometer /var/lock/ceilometer +end script + +exec start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-agent-compute diff --git a/debian/ceilometer-api.install b/debian/ceilometer-api.install new file mode 100644 index 0000000..308a676 --- /dev/null +++ b/debian/ceilometer-api.install @@ -0,0 +1 @@ +usr/bin/ceilometer-api diff --git a/debian/ceilometer-api.postrm b/debian/ceilometer-api.postrm new file mode 100644 index 0000000..2c434ad --- /dev/null +++ b/debian/ceilometer-api.postrm @@ -0,0 +1,7 @@ +#!/bin/sh -e + +if [ "$1" = purge ]; then + update-rc.d ceilometer-api remove +fi + +#DEBHELPER# diff --git a/debian/ceilometer-api.upstart b/debian/ceilometer-api.upstart new file mode 100644 index 0000000..9d10d17 --- /dev/null +++ b/debian/ceilometer-api.upstart @@ -0,0 +1,17 @@ +description "ceilometer-agent-compute" +author "Chuck Short " + +start on runlevel [2345] +stop on runlelvel [016] + +chdir /var/run + +pre-start script + mkdir -p /var/run/ceilometer + chown ceilometer:ceilometer /var/run/ceilometer + + mkdir -p /var/lock/ceilometer + chown ceilometer:ceilometer /var/lock/ceilometer +end script + +exec start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-api -- --log-dir=/var/log/ceilometer diff --git a/debian/ceilometer-collector.install b/debian/ceilometer-collector.install new file mode 100644 index 0000000..9a114b9 --- /dev/null +++ b/debian/ceilometer-collector.install @@ -0,0 +1 @@ +usr/bin/ceilometer-collector diff --git a/debian/ceilometer-collector.postrm b/debian/ceilometer-collector.postrm new file mode 100644 index 0000000..2ffb546 --- /dev/null +++ b/debian/ceilometer-collector.postrm @@ -0,0 +1,7 @@ +#!/bin/sh -e + +if [ "$1" = purge ]; then + update-rc.d ceilometer-collector remove +fi + +#DEBHELPER# diff --git a/debian/ceilometer-collector.upstart b/debian/ceilometer-collector.upstart new file mode 100644 index 0000000..0294fe6 --- /dev/null +++ b/debian/ceilometer-collector.upstart @@ -0,0 +1,17 @@ +description "ceilometer-agent-compute" +author "Chuck Short " + +start on runlevel [2345] +stop on runlelvel [!2345] + +chdir /var/run + +pre-start script + mkdir -p /var/run/ceilometer + chown ceilometer:ceilometer /var/run/ceilometer + + mkdir -p /var/lock/ceilometer + chown ceilometer:ceilometer /var/lock/ceilometer +end script + +exec start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-collector diff --git a/debian/ceilometer-common.dirs b/debian/ceilometer-common.dirs new file mode 100644 index 0000000..bce7e7b --- /dev/null +++ b/debian/ceilometer-common.dirs @@ -0,0 +1,3 @@ +etc/ceilometer +var/lib/ceilometer +var/log/ceilometer diff --git a/debian/ceilometer-common.install b/debian/ceilometer-common.install new file mode 100644 index 0000000..9e451fc --- /dev/null +++ b/debian/ceilometer-common.install @@ -0,0 +1,6 @@ +tools/show_data.py usr/share/doc/ceilometer +etc/ceilometer/ceilometer.conf etc/ceilometer +etc/ceilometer/policy.json etc/ceilometer +etc/ceilometer/sources.json etc/ceilometer +etc/ceilometer/pipeline.yaml etc/ceilometer +usr/bin/ceilometer-dbsync diff --git a/debian/ceilometer-common.postinst b/debian/ceilometer-common.postinst new file mode 100644 index 0000000..f61445c --- /dev/null +++ b/debian/ceilometer-common.postinst @@ -0,0 +1,23 @@ +#!/bin/sh -e + +if [ "$1" = "configure" ]; then + if ! getent group ceilometer > /dev/null 2>&1; then + addgroup --system ceilometer >/dev/null + fi + + if ! getent passwd ceilometer > /dev/null 2>&1; then + adduser --system --home /var/lib/ceilometer --ingroup ceilometer --no-create-home --shell /bin/false ceilometer + fi + + chown -R ceilometer:adm /var/log/ceilometer + chmod 0750 /var/log/ceilometer + chown -R ceilometer:ceilometer /var/lib/ceilometer /etc/ceilometer + + su -s /bin/sh -c '/usr/bin/ceilometer-dbsync' ceilometer + + if [ -e /var/lib/ceilometer/ceilometer.sqlite ]; then + chown ceilometer:ceilometer /var/lib/ceilometer/ceilometer.sqlite + chmod 0600 /var/lib/ceilometer/ceilometer.sqlite + fi +fi +#DEBHELPER# diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..39611f6 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,76 @@ +ceilometer (2013.1-0ubuntu1~cloud0) precise-grizzly; urgency=low + + * New upstream release for the Ubuntu Cloud Archive. + + -- Chuck Short Mon, 08 Apr 2013 07:50:35 -0500 + +ceilometer (2013.1-0ubuntu1) raring; urgency=low + + * New upstream release. + + -- Chuck Short Fri, 05 Apr 2013 14:34:37 -0500 + +ceilometer (2013.1~rc1-0ubuntu1) raring; urgency=low + + [ Chuck Short ] + * New upstream release. + * debian/watch: point to the right releases. + * debian/rules: Enable testsuite. + * debian/ceilometer-agent-compute.postinst: Add smarts to + configure users after install. + * debian/ceilometer-common.postinst: Configure ceilometer db. + * debian/ceilometer-common.install: Install configuration files. + * debian/*.upstart: Update and use start-stop-daemon. + + [ James Page ] + * Added watch file. + * d/rules: Fixup test suite execution as much as possible: + - Set PYTHONPATH to CURDIR during execution. + - Provide HOME directory for keystone tests. + - Override clean to tidy up after execution. + * d/control: Tidied BD's: + - Drop python-ming (not the right ming). + - python-oslo-config -> python-oslo.config. + - Dropped misc other surplus/duplicate dependencies. + - Wrapped and sorted. + * d/p/request-dep.patch: Remove upper bound on python-requests inline with + the rest of OpenStack. + * d/p/remove-hbase-support.patch: Remove happybase dependency. + * d/control: Bumped Standards-Version, no changes. + + [ Yolanda Robla ] + * d/rules: Copy ceilometer.conf.sample to ceilometer.conf. + * d/ceilometer-common.install: Install ceilometer.conf and ceilometer-dbsync. + * d/ceilometer-common.postinst: fixing user/group creation. + * d/*.upstart: Fix upstart jobs. + * d/pydist-overrides: Correct pymongo and wsme package names. + * d/control: modified mongodb recommends to suggests (LP: #1131627). + * d/files: copying pipeline.yaml. + * d/control: fixed typo (LP: #1140309). + * d/patches/default-dbconnection-sqlite.patch: default db to sqlite + + -- Chuck Short Tue, 26 Mar 2013 11:23:03 -0500 + +ceilometer (0.1-0ubuntu2) raring; urgency=low + + * Fix typo in debian/control (ceioleter -> ceilometer) (LP: #1140309) + + -- Hans Joachim Desserud Sun, 03 Mar 2013 20:08:39 +0100 + +ceilometer (0.1-0ubuntu1) quantal; urgency=low + + * New upstream release. + + -- Chuck Short Fri, 12 Oct 2012 09:34:05 -0500 + +ceilometer (0~20121002-0ubuntu2) quantal; urgency=low + + * Fix two typos in dependencies in debian/control (LP: #1063244) + + -- Adam Conrad Sun, 07 Oct 2012 07:49:55 -0600 + +ceilometer (0~20121002-0ubuntu1) quantal; urgency=low + + * Initial release. + + -- Chuck Short Wed, 03 Oct 2012 13:00:29 -0500 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..45a4fb7 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +8 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..3dc8f6c --- /dev/null +++ b/debian/control @@ -0,0 +1,151 @@ +Source: ceilometer +Section: python +Priority: optional +Maintainer: Chuck Short +Build-Depends: + debhelper (>= 8.0.0), + python-all (>= 2.6), + python-nose, + python-anyjson (>= 0.2.4), + python-argparse, + python-babel (>= 0.9.6), + python-coverage, + python-docutils, + python-eventlet, + python-extras, + python-flask (>= 0.9), + python-glanceclient, + python-iso8601, + python-keystoneclient (<< 1:0.3), + python-kombu, + python-lockfile, + python-lxml, + python-migrate, + python-mock, + python-mox, + python-netaddr, + python-netifaces, + python-novaclient (>= 2.6.10), + python-oslo.config, + python-pecan (>= 0.2.0), + python-pymongo (>= 2.2), + python-requests, + python-setuptools-git (>= 0.4), + python-sphinx, + python-sqlalchemy, + python-stevedore (>= 0.6), + python-swift, + python-swiftclient, + python-unittest2, + python-webob (>= 1.2), + python-wsme (>= 0.5b1), + python-yaml +Standards-Version: 3.9.4 + +Package: python-ceilometer +Architecture: all +Depends: ${misc:Depends}, ${python:Depends} +Description: ceilometer python libraries + Ceilometer aims to deliver a unique point of contact for billing systems to + aquire all counters they need to establish customer billing, accross all + current and future OpenStack components. The delivery of counters must + be tracable and auditable, the counters must be easily extensible to support + new projects, and agents doing data collections should be + independent of the overall system. + . + (A ceilometer is an instrument that measures cloud coverage.) + . + This package contains the python libraries that are needed for all parts + of ceilometer + +Package: ceilometer-common +Architecture: all +Depends: + adduser, + python-ceilometer (= ${binary:Version}), + ${misc:Depends}, + ${python:Depends} +Provides: ${python:Provides} +Description: ceilometer common files + Ceilometer aims to deliver a unique point of contact for billing systems to + aquire all counters they need to establish customer billing, accross all + current and future OpenStack components. The delivery of counters must + be tracable and auditable, the counters must be easily extensible to support + new projects, and agents doing data collections should be + independent of the overall system. + . + (A ceilometer is an instrument that measures cloud coverage.) + . + This package contains files that are needed for all parts of ceilometer + +Package: ceilometer-collector +Architecture: all +Depends: + ceilometer-common (= ${binary:Version}), + ${misc:Depends}, + ${python:Depends} +Suggests: mongodb +Description: ceilometer collector service + Ceilometer aims to deliver a unique point of contact for billing systems to + aquire all counters they need to establish customer billing, accross all + current and future OpenStack components. The delivery of counters must + be tracable and auditable, the counters must be easily extensible to support + new projects, and agents doing data collections should be + independent of the overall system. + . + (A ceilometer is an instrument that measures cloud coverage.) + . + This package contains the collector service + +Package: ceilometer-api +Architecture: all +Depends: + ceilometer-common (= ${binary:Version}), + ${misc:Depends}, + ${python:Depends} +Suggests: mongodb +Description: ceilometer api service + Ceilometer aims to deliver a unique point of contact for billing systems to + aquire all counters they need to establish customer billing, accross all + current and future OpenStack components. The delivery of counters must + be tracable 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 api service + +Package: ceilometer-agent-compute +Architecture: all +Depends: + ceilometer-common (= ${binary:Version}), + ${misc:Depends}, + ${python:Depends} +Description: ceilometer compute agent + Ceilometer aims to deliver a unique point of contact for billing systems to + aquire all counters they need to establish customer billing, accross all + current and future OpenStack components. The delivery of counters must + be tracable and auditable, the counters must be easily extensible to support + new projects, and agents doing data collections should be + independent of the overall system. + . + (A ceilometer is an instrument that measures cloud coverage.) + . + This package contains the compute agent + +Package: ceilometer-agent-central +Architecture: all +Depends: + ceilometer-common (= ${binary:Version}), + ${misc:Depends}, + ${python:Depends} +Description: ceilometer central agent + Ceilometer aims to deliver a unique point of contact for billing systems to + aquire all counters they need to establish customer billing, accross all + current and future OpenStack components. The delivery of counters must + be tracable and auditable, the counters must be easily extensible to support + new projects, and agents doing data collections should be + independent of the overall system. + . + (A ceilometer is an instrument that measures cloud coverage.) + . + This package contains the central agent. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..e9c1ee7 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,46 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: ceilometer +Source: https://github.com/stackforge/ceilometer + +Files: * +Copyright: 2012 New Dream Network, LLC (DreamHost) + 2012 eNovance + 2012 Red Hat Inc. + 2010 United States Government + 2011 Cloudscaling Group, Inc + 2011 OpenStack LLC. + 2012 Nicolas Barcet for Canonical +License: Apache-2 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian-based systems the full text of the Apache version 2.0 license + can be found in `/usr/share/common-licenses/Apache-2.0'. + +Files: debian/* +Copyright: 2012 Canonical Ltd +License: Apache-2 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian-based systems the full text of the Apache version 2.0 license + can be found in `/usr/share/common-licenses/Apache-2.0'. + diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..b43bf86 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README.md diff --git a/debian/patches/default-dbconnection-sqlite.patch b/debian/patches/default-dbconnection-sqlite.patch new file mode 100644 index 0000000..0c7e007 --- /dev/null +++ b/debian/patches/default-dbconnection-sqlite.patch @@ -0,0 +1,11 @@ +--- a/etc/ceilometer/ceilometer.conf.sample ++++ b/etc/ceilometer/ceilometer.conf.sample +@@ -262,7 +262,7 @@ + + ######## defined in ceilometer.storage ######## + +-# database_connection=mongodb://localhost:27017/ceilometer ++database_connection=sqlite:////var/lib/ceilometer/ceilometer.sqlite + #### (StrOpt) Database connection string + + diff --git a/debian/patches/remove-hbase-support.patch b/debian/patches/remove-hbase-support.patch new file mode 100644 index 0000000..e8c98e2 --- /dev/null +++ b/debian/patches/remove-hbase-support.patch @@ -0,0 +1,12 @@ +Description: Drop unpackaged happybase from dependencies + This avoids breaking stevedore extensions via endpoints. +Author: James Page +Forwarded: not-needed + +--- a/tools/pip-requires ++++ b/tools/pip-requires +@@ -20,4 +20,3 @@ extras + wsme>=0.5b1 + pyyaml + oslo.config>=1.1.0 +-happybase>=0.4 diff --git a/debian/patches/requests-dep.patch b/debian/patches/requests-dep.patch new file mode 100644 index 0000000..128bafe --- /dev/null +++ b/debian/patches/requests-dep.patch @@ -0,0 +1,15 @@ +Description: Remove upper bound on requests +Author: James Page +Forwarded: no + +--- a/tools/pip-requires ++++ b/tools/pip-requires +@@ -15,7 +15,7 @@ python-novaclient>=2.6.10 + python-keystoneclient>=0.2.3 + python-swiftclient + lxml +-requests<1.0 ++requests + extras + wsme>=0.5b1 + pyyaml diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..201075b --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +remove-hbase-support.patch +requests-dep.patch +default-dbconnection-sqlite.patch diff --git a/debian/pydist-overrides b/debian/pydist-overrides new file mode 100644 index 0000000..7969526 --- /dev/null +++ b/debian/pydist-overrides @@ -0,0 +1 @@ +pymongo python-pymongo diff --git a/debian/python-ceilometer.install b/debian/python-ceilometer.install new file mode 100644 index 0000000..036c6b9 --- /dev/null +++ b/debian/python-ceilometer.install @@ -0,0 +1 @@ +usr/lib/python*/dist-packages/* diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..789ab93 --- /dev/null +++ b/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export HOME="$(CURDIR)/debian/test" + +%: + dh $@ --with python2 + +get-orig-source: + uscan --verbose --force-download --rename --destdir=../build-area + +ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) +override_dh_auto_test: + mkdir -p ${HOME} + PYTHONPATH=$(CURDIR) nosetests || true +endif + +override_dh_install: + cp etc/ceilometer/ceilometer.conf.sample etc/ceilometer/ceilometer.conf + dh_install + +override_dh_auto_clean: + rm -f etc/ceilometer/ceilometer.conf + rm -f ${HOME} + dh_auto_clean diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100755 index 0000000..267f14e --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \ + https://launchpad.net/ceilometer/+download https://launchpad.net/ceilometer/.*/.*/.*/ceilometer-(.*)\.tar\.gz