Merge "Drop Travis CI support - Update links"
diff --git a/ceilometer/backend/upgrade.sls b/ceilometer/backend/upgrade.sls
index 31efe2c..41a52fd 100644
--- a/ceilometer/backend/upgrade.sls
+++ b/ceilometer/backend/upgrade.sls
@@ -3,6 +3,7 @@
ceilometer_upgrade:
cmd.run:
- name: ceilometer-upgrade
+ - runas: 'ceilometer'
{%- if grains.get('noservices') or server.get('role', 'primary') == 'secondary' %}
- onlyif: /bin/false
{%- endif %}
diff --git a/ceilometer/meta/telegraf.yml b/ceilometer/meta/telegraf.yml
index 074db4f..f4d5820 100644
--- a/ceilometer/meta/telegraf.yml
+++ b/ceilometer/meta/telegraf.yml
@@ -1,5 +1,5 @@
{%- from "ceilometer/map.jinja" import server with context %}
-{%- if server.get('enabled', False) %}
+{%- if server.get('enabled', False) and server.version in ['juno', 'kilo', 'liberty', 'mitaka', 'newton', 'ocata'] %}
agent:
input:
http_response:
diff --git a/debian/control b/debian/control
index 62d6300..6b02b93 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
Source: salt-formula-ceilometer
-Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
+Maintainer: Mirantis Dev <dev@mirantis.com>
Uploaders: Filip Pytloun <filip@pytloun.cz>,
Ondřej Nový <onovy@debian.org>,
Section: admin
@@ -10,7 +10,7 @@
python-yaml,
salt-formula-keystone,
Standards-Version: 3.9.6
-Homepage: https://wiki.openstack.org/wiki/OpenStackSalt
+Homepage: https://www.mirantis.com
Vcs-Browser: https://anonscm.debian.org/cgit/openstack/salt-formula-ceilometer.git/
Vcs-Git: https://anonscm.debian.org/git/openstack/salt-formula-ceilometer.git
diff --git a/debian/copyright b/debian/copyright
index c06d132..394e5f9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@
Source: https://github.com/openstack/salt-formula-ceilometer
Files: *
-Copyright: 2014-2016 tcp cloud
+Copyright: 2014-2019 Mirantis Inc. et al
License: Apache-2.0
Files: debian/*