diff -pruN 2016.12.1-1/debian/changelog 2016.12.1-1ubuntu1/debian/changelog --- 2016.12.1-1/debian/changelog 2016-12-25 16:05:26.000000000 +0000 +++ 2016.12.1-1ubuntu1/debian/changelog 2018-02-14 23:18:13.000000000 +0000 @@ -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 -pruN 2016.12.1-1/debian/control 2016.12.1-1ubuntu1/debian/control --- 2016.12.1-1/debian/control 2016-11-21 14:55:36.000000000 +0000 +++ 2016.12.1-1ubuntu1/debian/control 2018-02-14 23:18:13.000000000 +0000 @@ -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 -pruN 2016.12.1-1/debian/patches/0001-Support-Python-3.patch 2016.12.1-1ubuntu1/debian/patches/0001-Support-Python-3.patch --- 2016.12.1-1/debian/patches/0001-Support-Python-3.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2016.12.1-1ubuntu1/debian/patches/0001-Support-Python-3.patch 2018-02-14 23:18:13.000000000 +0000 @@ -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 be hacked + metering_secret={{ server.secret }} + +-{%- for publisher_name, publisher in server.get('publisher', {}).iteritems() %} ++{%- for publisher_name, publisher in server.get('publisher', {}).items() %} + {%- if publisher_name == 'graphite' %} + + graphite=ceilometer.publisher.graphite:GraphitePublisher +--- a/ceilometer/files/juno/pipeline.yaml ++++ b/ceilometer/files/juno/pipeline.yaml +@@ -41,7 +41,7 @@ + - name: meter_sink + transformers: + publishers: +- {%- for publisher_name, publisher in publisher.iteritems() %} ++ {%- for publisher_name, publisher in publisher.items() %} + {%- if publisher_name == 'default' %} + - notifier:// + {%- endif %} +@@ -59,7 +59,7 @@ + type: "gauge" + scale: "100.0 / (10**9 * (resource_metadata.cpu_number or 1))" + publishers: +- {%- for publisher_name, publisher in publisher.iteritems() %} ++ {%- for publisher_name, publisher in publisher.items() %} + {%- if publisher_name == 'default' %} + - notifier:// + {%- endif %} +@@ -81,7 +81,7 @@ + unit: "\\1/s" + type: "gauge" + publishers: +- {%- for publisher_name, publisher in publisher.iteritems() %} ++ {%- for publisher_name, publisher in publisher.items() %} + {%- if publisher_name == 'default' %} + - notifier:// + {%- endif %} +@@ -103,7 +103,7 @@ + unit: "\\1/s" + type: "gauge" + publishers: +- {%- for publisher_name, publisher in publisher.iteritems() %} ++ {%- for publisher_name, publisher in publisher.items() %} + {%- if publisher_name == 'default' %} + - notifier:// + {%- endif %} +--- a/ceilometer/files/kilo/ceilometer-server.conf.Debian ++++ b/ceilometer/files/kilo/ceilometer-server.conf.Debian +@@ -408,7 +408,7 @@ + #metering_secret=change this or be hacked + telemetry_secret={{ server.secret }} + +-{%- for publisher_name, publisher in server.get('publisher', {}).iteritems() %} ++{%- for publisher_name, publisher in server.get('publisher', {}).items() %} + {%- if publisher_name == 'graphite' %} + + graphite=ceilometer.publisher.graphite:GraphitePublisher +--- a/ceilometer/files/kilo/pipeline.yaml ++++ b/ceilometer/files/kilo/pipeline.yaml +@@ -45,7 +45,7 @@ + - name: meter_sink + transformers: + publishers: +- {%- for publisher_name, publisher in publisher.iteritems() %} ++ {%- for publisher_name, publisher in publisher.items() %} + {%- if publisher_name == 'default' %} + - notifier:// + {%- endif %} +@@ -63,7 +63,7 @@ + type: "gauge" + scale: "100.0 / (10**9 * (resource_metadata.cpu_number or 1))" + publishers: +- {%- for publisher_name, publisher in publisher.iteritems() %} ++ {%- for publisher_name, publisher in publisher.items() %} + {%- if publisher_name == 'default' %} + - notifier:// + {%- endif %} +@@ -85,7 +85,7 @@ + unit: "\\1/s" + type: "gauge" + publishers: +- {%- for publisher_name, publisher in publisher.iteritems() %} ++ {%- for publisher_name, publisher in publisher.items() %} + {%- if publisher_name == 'default' %} + - notifier:// + {%- endif %} +@@ -107,7 +107,7 @@ + unit: "\\1/s" + type: "gauge" + publishers: +- {%- for publisher_name, publisher in publisher.iteritems() %} ++ {%- for publisher_name, publisher in publisher.items() %} + {%- if publisher_name == 'default' %} + - notifier:// + {%- endif %} +--- a/ceilometer/files/liberty/ceilometer-server.conf.Debian ++++ b/ceilometer/files/liberty/ceilometer-server.conf.Debian +@@ -409,7 +409,7 @@ + #metering_secret=change this or be hacked + telemetry_secret={{ server.secret }} + +-{%- for publisher_name, publisher in server.get('publisher', {}).iteritems() %} ++{%- for publisher_name, publisher in server.get('publisher', {}).items() %} + {%- if publisher_name == 'graphite' %} + + graphite=ceilometer.publisher.graphite:GraphitePublisher +--- a/ceilometer/files/liberty/pipeline.yaml ++++ b/ceilometer/files/liberty/pipeline.yaml +@@ -46,7 +46,7 @@ + - name: meter_sink + transformers: + publishers: +- {%- for publisher_name, publisher in publisher.iteritems() %} ++ {%- for publisher_name, publisher in publisher.items() %} + {%- if publisher_name == 'default' %} + - notifier:// + {%- endif %} +@@ -64,7 +64,7 @@ + type: "gauge" + scale: "100.0 / (10**9 * (resource_metadata.cpu_number or 1))" + publishers: +- {%- for publisher_name, publisher in publisher.iteritems() %} ++ {%- for publisher_name, publisher in publisher.items() %} + {%- if publisher_name == 'default' %} + - notifier:// + {%- endif %} +@@ -95,7 +95,7 @@ + unit: "\\1/s" + type: "gauge" + publishers: +- {%- for publisher_name, publisher in publisher.iteritems() %} ++ {%- for publisher_name, publisher in publisher.items() %} + {%- if publisher_name == 'default' %} + - notifier:// + {%- endif %} +@@ -117,7 +117,7 @@ + unit: "\\1/s" + type: "gauge" + publishers: +- {%- for publisher_name, publisher in publisher.iteritems() %} ++ {%- for publisher_name, publisher in publisher.items() %} + {%- if publisher_name == 'default' %} + - notifier:// + {%- endif %} +--- a/ceilometer/files/mitaka/ceilometer-server.conf.Debian ++++ b/ceilometer/files/mitaka/ceilometer-server.conf.Debian +@@ -412,7 +412,7 @@ + #metering_secret=change this or be hacked + telemetry_secret={{ server.secret }} + +-{%- for publisher_name, publisher in server.get('publisher', {}).iteritems() %} ++{%- for publisher_name, publisher in server.get('publisher', {}).items() %} + {%- if publisher_name == 'graphite' %} + + graphite=ceilometer.publisher.graphite:GraphitePublisher +--- a/ceilometer/files/mitaka/compute_pipeline.yaml ++++ b/ceilometer/files/mitaka/compute_pipeline.yaml +@@ -17,7 +17,7 @@ + - name: meter_sink + transformers: + publishers: +- {%- for publisher_name, publisher in publisher.iteritems() %} ++ {%- for publisher_name, publisher in publisher.items() %} + {%- if publisher_name == 'graphite' %} + - graphite://{{ publisher.host }}:{{ publisher.port }} + {%- else %} +--- a/ceilometer/files/mitaka/pipeline.yaml ++++ b/ceilometer/files/mitaka/pipeline.yaml +@@ -17,7 +17,7 @@ + - name: meter_sink + transformers: + publishers: +- {%- for publisher_name, publisher in publisher.iteritems() %} ++ {%- for publisher_name, publisher in publisher.items() %} + {%- if publisher_name == 'default' %} + - notifier:// + {%- endif %} +--- a/ceilometer/server.sls ++++ b/ceilometer/server.sls +@@ -12,7 +12,7 @@ + - require: + - pkg: ceilometer_server_packages + +-{%- for publisher_name, publisher in server.get('publisher', {}).iteritems() %} ++{%- for publisher_name, publisher in server.get('publisher', {}).items() %} + + {%- if publisher_name != "default" %} + diff -pruN 2016.12.1-1/debian/patches/series 2016.12.1-1ubuntu1/debian/patches/series --- 2016.12.1-1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 2016.12.1-1ubuntu1/debian/patches/series 2018-02-14 23:16:38.000000000 +0000 @@ -0,0 +1 @@ +0001-Support-Python-3.patch