From 8b60351be5f45aa84d4b923b15ae01302b2669a3 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Sun, 22 Sep 2019 07:28:08 +0100
Subject: [PATCH] Fix ceilometer action

---
 zaza/openstack/charm_tests/aodh/.tests.py.swp | Bin 16384 -> 0 bytes
 zaza/openstack/charm_tests/aodh/setup.py      |   2 +-
 zaza/openstack/configure/telemetry.py         |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 zaza/openstack/charm_tests/aodh/.tests.py.swp

diff --git a/zaza/openstack/charm_tests/aodh/.tests.py.swp b/zaza/openstack/charm_tests/aodh/.tests.py.swp
deleted file mode 100644
index 431d6bca4e2bc867994a800908f7a9d92ed31557..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
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

diff --git a/zaza/openstack/charm_tests/aodh/setup.py b/zaza/openstack/charm_tests/aodh/setup.py
index c83f453..cb02ecb 100644
--- a/zaza/openstack/charm_tests/aodh/setup.py
+++ b/zaza/openstack/charm_tests/aodh/setup.py
@@ -19,4 +19,4 @@ import zaza.openstack.configure.telemetry
 
 def ceilometer_upgrade():
     """Run ceilometer upgrade action."""
-    zaza.openstack.configure.telemetry.ceilometer_upgrade()
+    zaza.openstack.configure.telemetry.ceilometer_upgrade('ceilometer')
diff --git a/zaza/openstack/configure/telemetry.py b/zaza/openstack/configure/telemetry.py
index 54061b1..880395d 100644
--- a/zaza/openstack/configure/telemetry.py
+++ b/zaza/openstack/configure/telemetry.py
@@ -24,7 +24,7 @@ import zaza.model
 
 def ceilometer_upgrade(application_name=None, model_name=None):
     zaza.model.run_action_on_leader(
-        application_name or self.application_name,
+        application_name,
         'ceilometer-upgrade',
         model_name=model_name,
         action_params={})