[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#985430: marked as done (unblock: ceilometer/1:15.0.0-1->1:15.0.0-3)

Your message dated Thu, 18 Mar 2021 20:48:01 +0000
with message-id <E1lMzYn-0005k3-Uy@respighi.debian.org>
and subject line unblock ceilometer
has caused the Debian Bug report #985430,
regarding unblock: ceilometer/1:15.0.0-1->1:15.0.0-3
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
985430: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=985430
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package ceilometer

The only diff is adding /etc/ceilometer/gnocchi_resources.yaml, to show
our users that Ceilometer can be configured there (Ceilometer otherwise
takes the copy of the file from /usr/share). So this is mostly cosmetic,
but I still think it's important.

Debdiff attached.

Cheers,

Thomas Goirand (zigo)

diff --git a/debian/changelog b/debian/changelog
index 2bb3032e0..42289490c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+ceilometer (1:15.0.0-3) unstable; urgency=medium
+
+  * Do not symlink gnocchi_resources.yaml, just copy it in /etc/ceilometer, as
+    it has precedence in the Ceilometer code anyway.
+  * Remove Breaks: + Replaces: python3-ceilometer (<< 1:15.0.0-2~), in fact not
+    needed (we're not moving a file).
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 03 Mar 2021 14:25:36 +0100
+
+ceilometer (1:15.0.0-2) unstable; urgency=medium
+
+  * Move gnocchi_resources.yaml in ceilometer-common:/etc/ceilometer, so that
+    it becomes a CONFFILE.
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 03 Mar 2021 10:49:38 +0100
+
 ceilometer (1:15.0.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index dddfb1b9c..4af562d22 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,6 +55,11 @@ endif
 	# Fix default path for lock_path
 	pkgos-fix-config-default $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf oslo_concurrency lock_path /var/lock/ceilometer
 
+	# Move the gnocchi_resources.yaml to /etc
+	mkdir -p $(CURDIR)/debian/ceilometer-common/etc/ceilometer
+	cp $(CURDIR)/debian/python3-ceilometer/usr/lib/python3/dist-packages/ceilometer/publisher/data/gnocchi_resources.yaml \
+		$(CURDIR)/debian/ceilometer-common/etc/ceilometer/gnocchi_resources.yaml
+
 override_dh_sphinxdoc:
 ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
 	PYTHONPATH=. PYTHON=python3 python3 -m sphinx -b html doc/source $(CURDIR)/debian/ceilometer-doc/usr/share/doc/ceilometer-doc/html

--- End Message ---
--- Begin Message --- 
Unblocked.

--- End Message ---
Reply to: