Merge "Seperated out Telemetry Alarming (Aodh)"

defaults/main.yml

@@ -13,9 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Defines that the role will be deployed on a host machine
-is_metal: true
-
 ## Verbosity Options
 debug: False
 verbose: True
@@ -55,12 +52,9 @@ ceilometer_rabbitmq_vhost: /ceilometer
 
 #Ceilometer services info
 ceilometer_role_name: admin
-ceilometer_api_host_address: 0.0.0.0
-ceilometer_api_service_port: 8777
+
 ceilometer_collector_program_name: ceilometer-collector
 ceilometer_compute_program_name: ceilometer-agent-compute
-ceilometer_alarm_notifier_program_name: ceilometer-alarm-notifier
-ceilometer_alarm_evaluator_program_name: ceilometer-alarm-evaluator
 ceilometer_api_program_name: ceilometer-api
 ceilometer_agent_notification_program_name: ceilometer-agent-notification
 ceilometer_agent_central_program_name: ceilometer-agent-central
@@ -109,8 +103,6 @@ ceilometer_pip_packages:
 ## Service Names
 ceilometer_service_names:
   - "ceilometer-api"
-  - "ceilometer-alarm-notifier"
-  - "ceilometer-alarm-evaluator"
   - "ceilometer-collector"
   - "ceilometer-agent-notification"
   - "ceilometer-agent-central"
@@ -124,4 +116,3 @@ ceilometer_api_paste_ini_overrides: {}
 ceilometer_event_definitions_yaml_overrides: {}
 ceilometer_event_pipeline_yaml_overrides: {}
 ceilometer_pipeline_yaml_overrides: {}
-

handlers/main.yml

@@ -32,18 +32,6 @@
     state: "restarted"
     pattern: "{{ ceilometer_compute_program_name }}"
 
-- name: Restart ceilometer alarm_notifier
-  service:
-    name: "{{ ceilometer_alarm_notifier_program_name }}"
-    state: "restarted"
-    pattern: "{{ ceilometer_alarm_notifier_program_name }}"
-
-- name: Restart ceilometer alarm_evaluator
-  service:
-    name: "{{ ceilometer_alarm_evaluator_program_name }}"
-    state: "restarted"
-    pattern: "{{ ceilometer_alarm_evaluator_program_name }}"
-
 - name: Restart ceilometer agent_notification
   service:
     name: "{{ ceilometer_agent_notification_program_name }}"

tasks/ceilometer_upstart_init.yml

@@ -13,28 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: ceilometer_upstart_common_init.yml
-  vars:
-    program_name: "{{ ceilometer_alarm_notifier_program_name }}"
-    service_name: "{{ ceilometer_service_name }}"
-    system_user: "{{ ceilometer_system_user_name }}"
-    system_group: "{{ ceilometer_system_group_name }}"
-    service_home: "{{ ceilometer_system_user_home }}"
-  when: inventory_hostname in groups['ceilometer_alarm_notifier']
-  tags:
-    - ceilometer-alarm-notifier-init
-
-- include: ceilometer_upstart_common_init.yml
-  vars:
-    program_name: "{{ ceilometer_alarm_evaluator_program_name }}"
-    service_name: "{{ ceilometer_service_name }}"
-    system_user: "{{ ceilometer_system_user_name }}"
-    system_group: "{{ ceilometer_system_group_name }}"
-    service_home: "{{ ceilometer_system_user_home }}"
-  when: inventory_hostname in groups['ceilometer_alarm_evaluator']
-  tags:
-    - ceilometer-alarm-evaluator-init
-
 - include: ceilometer_upstart_common_init.yml
   vars:
     program_name: "{{ ceilometer_api_program_name }}"

templates/ceilometer.conf.j2

@@ -23,7 +23,7 @@ port = 8777
 [database]
 metering_connection = {{ ceilometer_connection_string }}
 event_connection = {{ ceilometer_connection_string }}
-alarm_connection = {{ ceilometer_connection_string }}
+alarm_connection = {{ aodh_connection_string }}
 
 [keystone_authtoken]
 signing_dir = /var/cache/ceilometer