Remove duplicate code for running ceilometer upgrade and fix typo

zaza/openstack/charm_tests/aodh/__init__.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Collection of code for setting up and testing masakari."""
+"""Collection of code for setting up and testing aodh."""

zaza/openstack/charm_tests/aodh/setup.py

@@ -1,22 +0,0 @@
-# Copyright 2019 Canonical Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Code for setting up aodh tests."""
-
-import zaza.openstack.configure.telemetry
-
-
-def ceilometer_upgrade():
-    """Run ceilometer upgrade action."""
-    zaza.openstack.configure.telemetry.ceilometer_upgrade('ceilometer')