Bug#889927: salt-formula-ceilometer: FTBFS and Debci failure with salt 2017.7.2

2018-02-14 Thread Benjamin Drung 
forwarded 889927 https://github.com/salt-formulas/salt-formula-ceilometer/pull/6
thanks

Hi,

the build failure is caused by missing Python 3 support. I created a
upstream pull request and backported that commit for the Debian package.
An attached patch that I applied for the Ubuntu package is attached.

On Thu, 08 Feb 2018 22:58:19 +0200 Adrian Bunk  wrote:
> Source: salt-formula-ceilometer
> Version: 2016.12.1-1
> Severity: serious
> Tags: buster sid
> 
> https://ci.debian.net/packages/s/salt-formula-ceilometer/unstable/amd6
4/
> https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/sal
t-formula-ceilometer.html
> 
> ...
>dh_auto_test
>   make -j15 test
> make[1]: Entering directory '/build/1st/salt-formula-ceilometer-
2016.12.1'
> [ ! -d tests ] || (cd tests; ./run_tests.sh)
> /usr/bin/salt-call
> [ERROR   ] Rendering exception occurred: Jinja variable
'salt.utils.odict.OrderedDict object' has no attribute 'iteritems'
> [CRITICAL] Rendering SLS 'base:ceilometer.agent' failed: Jinja
variable 'salt.utils.odict.OrderedDict object' has no attribute
'iteritems'
> local:
> - Rendering SLS 'base:ceilometer.agent' failed: Jinja variable
'salt.utils.odict.OrderedDict object' has no attribute 'iteritems'
> [ERROR] Execution of ceilometer.agent_cluster failed
> [ERROR] Execution failed
> Makefile:22: recipe for target 'test' failed
> make[1]: *** [test] Error 1
> 
> 
-- 
Benjamin Drung
Debian & Ubuntu Developerdiff -Nru salt-formula-ceilometer-2016.12.1/debian/changelog salt-formula-ceilometer-2016.12.1/debian/changelog
--- salt-formula-ceilometer-2016.12.1/debian/changelog	2016-12-25 17:05:26.0 +0100
+++ salt-formula-ceilometer-2016.12.1/debian/changelog	2018-02-15 00:18:13.0 +0100
@@ -1,3 +1,9 @@
+salt-formula-ceilometer (2016.12.1-1ubuntu1) bionic; urgency=medium
+
+  * Support Python 3 (Closes: #889927)
+
+ -- Benjamin Drung   Thu, 15 Feb 2018 00:18:13 +0100
+
 salt-formula-ceilometer (2016.12.1-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru salt-formula-ceilometer-2016.12.1/debian/control salt-formula-ceilometer-2016.12.1/debian/control
--- salt-formula-ceilometer-2016.12.1/debian/control	2016-11-21 15:55:36.0 +0100
+++ salt-formula-ceilometer-2016.12.1/debian/control	2018-02-15 00:18:13.0 +0100
@@ -1,5 +1,6 @@
 Source: salt-formula-ceilometer
-Maintainer: PKG OpenStack 
+Maintainer: Ubuntu Developers 
+XSBC-Original-Maintainer: PKG OpenStack 
 Uploaders: Filip Pytloun ,
Ondřej Nový ,
 Section: admin
diff -Nru salt-formula-ceilometer-2016.12.1/debian/patches/0001-Support-Python-3.patch salt-formula-ceilometer-2016.12.1/debian/patches/0001-Support-Python-3.patch
--- salt-formula-ceilometer-2016.12.1/debian/patches/0001-Support-Python-3.patch	1970-01-01 01:00:00.0 +0100
+++ salt-formula-ceilometer-2016.12.1/debian/patches/0001-Support-Python-3.patch	2018-02-15 00:18:13.0 +0100
@@ -0,0 +1,227 @@
+From d473ad28bc38e2152f77c8b50133e65e458776d1 Mon Sep 17 00:00:00 2001
+From: Benjamin Drung 
+Date: Tue, 13 Feb 2018 23:39:58 +0100
+Subject: [PATCH] Support Python 3
+
+Bug-Debian: https://bugs.debian.org/889927
+Forwarded: https://github.com/salt-formulas/salt-formula-ceilometer/pull/6
+---
+ ceilometer/agent.sls   | 2 +-
+ ceilometer/files/juno/ceilometer-server.conf.Debian| 2 +-
+ ceilometer/files/juno/pipeline.yaml| 8 
+ ceilometer/files/kilo/ceilometer-server.conf.Debian| 2 +-
+ ceilometer/files/kilo/pipeline.yaml| 8 
+ ceilometer/files/liberty/ceilometer-server.conf.Debian | 2 +-
+ ceilometer/files/liberty/pipeline.yaml | 8 
+ ceilometer/files/mitaka/ceilometer-server.conf.Debian  | 2 +-
+ ceilometer/files/mitaka/compute_pipeline.yaml  | 2 +-
+ ceilometer/files/mitaka/pipeline.yaml  | 2 +-
+ ceilometer/files/newton/compute_pipeline.yaml  | 2 +-
+ ceilometer/files/newton/pipeline.yaml  | 2 +-
+ ceilometer/files/ocata/compute_pipeline.yaml   | 2 +-
+ ceilometer/files/ocata/pipeline.yaml   | 2 +-
+ ceilometer/server.sls  | 4 ++--
+ 15 files changed, 25 insertions(+), 25 deletions(-)
+
+--- a/ceilometer/agent.sls
 b/ceilometer/agent.sls
+@@ -12,7 +12,7 @@
+   - require:
+ - pkg: ceilometer_agent_packages
+ 
+-{%- for publisher_name, publisher in agent.get('publisher', {}).iteritems() %}
++{%- for publisher_name, publisher in agent.get('publisher', {}).items() %}
+ 
+ {%- if publisher_name != "default" %}
+ 
+--- a/ceilometer/files/juno/ceilometer-server.conf.Debian
 b/ceilometer/files/juno/ceilometer-server.conf.Debian
+@@ -928,7 +928,7 @@
+ #metering_secret=change this or

Bug#889927: salt-formula-ceilometer: FTBFS and Debci failure with salt 2017.7.2

2018-02-08 Thread Adrian Bunk 
Source: salt-formula-ceilometer
Version: 2016.12.1-1
Severity: serious
Tags: buster sid

https://ci.debian.net/packages/s/salt-formula-ceilometer/unstable/amd64/
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/salt-formula-ceilometer.html

...
   dh_auto_test
make -j15 test
make[1]: Entering directory '/build/1st/salt-formula-ceilometer-2016.12.1'
[ ! -d tests ] || (cd tests; ./run_tests.sh)
/usr/bin/salt-call
[ERROR   ] Rendering exception occurred: Jinja variable 
'salt.utils.odict.OrderedDict object' has no attribute 'iteritems'
[CRITICAL] Rendering SLS 'base:ceilometer.agent' failed: Jinja variable 
'salt.utils.odict.OrderedDict object' has no attribute 'iteritems'
local:
- Rendering SLS 'base:ceilometer.agent' failed: Jinja variable 
'salt.utils.odict.OrderedDict object' has no attribute 'iteritems'
[ERROR] Execution of ceilometer.agent_cluster failed
[ERROR] Execution failed
Makefile:22: recipe for target 'test' failed
make[1]: *** [test] Error 1