Cleanup a couple of files

Remove a couple of weird unicode characters prepended to lines
in devstack/README.txt

Replace an inaccurate comment in alarming.py with one explaining
why the current behavior is correct. This matches the behavior of
the Java API

Change-Id: Ic91c97817d787e2732ee8b65ede114a4d109ffa6
This commit is contained in:
Craig Bryant 2015-11-19 15:21:02 -07:00
parent f7a883d143
commit 49ff3d3806
2 changed files with 3 additions and 4 deletions

View File

@ -67,10 +67,10 @@ To run Monasca in DevStack, do the following three steps.
3. Run './stack.sh' from the root of the devstack directory.
If you want to run Monasca with the bare mininum of OpenStack components
If you want to run Monasca with the bare mininum of OpenStack components
you can add the following two lines to the local.conf file.
disable_all_services
disable_all_services
enable_service rabbit mysql key tempest

View File

@ -47,6 +47,7 @@ class Alarming(object):
old_state, new_state,
time_ms):
# This is a change via the API, so there is no SubAlarm info to add
sub_alarms = []
metrics = []
alarm_transitioned_event_msg = {u'alarm-transitioned': {
@ -65,8 +66,6 @@ class Alarming(object):
u'metrics': metrics}
}
# TODO(msbielinski): need to populate subalarms
for alarm_metric_row in alarm_metric_rows:
metric = self._build_metric(alarm_metric_row)
metrics.append(metric)