Merge "cleanup aodh redirect"

Author: Jenkins

ceilometerclient/v2/alarms.py

@@ -70,13 +70,7 @@ def __getattr__(self, k):
 class AlarmManager(base.Manager):
     resource_class = Alarm
 
-    def __init__(self, api, aodh_enabled=False):
-        self.aodh_enabled = aodh_enabled
-        super(AlarmManager, self).__init__(api)
-
     def _path(self, id=None):
-        # TODO(liusheng) if aodh will only have v1 api, we need to change
-        # following path if aodh enabled (self.aodh_enabled)
         return '/v2/alarms/%s' % id if id else '/v2/alarms'
 
     def list(self, q=None):

ceilometerclient/v2/client.py

@@ -78,7 +78,7 @@ def __init__(self, *args, **kwargs):
         self.new_samples = samples.SampleManager(self.http_client)
         self.statistics = statistics.StatisticsManager(self.http_client)
         self.resources = resources.ResourceManager(self.http_client)
-        self.alarms = alarms.AlarmManager(self.alarm_client, aodh_enabled)
+        self.alarms = alarms.AlarmManager(self.alarm_client)
         self.events = events.EventManager(self.event_client)
         self.event_types = event_types.EventTypeManager(self.event_client)
         self.traits = traits.TraitManager(self.event_client)