Merge pull request Mirantis#241 from simonpasquier/enable-notificatio…

…ns-for-mk22-lab-basic Enable StackLight notifications for mk22 basic lab
ppetit · Jan 13, 2017 · 6cd50c9 · 6cd50c9
2 parents 6c544ea + 1630958
commit 6cd50c9
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/classes/cluster/mk22_lab_basic/openstack/compute.yml b/classes/cluster/mk22_lab_basic/openstack/compute.yml
@@ -34,7 +34,7 @@ parameters:
       vncproxy_url: http://${_param:cluster_vip_address}:6080
       notification:
         driver: messagingv2
-        topics: notifications
+        topics: "notifications,${_param:stacklight_notification_topic}"
         notify_on:
           state_change: vm_and_task_state
       message_queue:

diff --git a/classes/cluster/mk22_lab_basic/openstack/control.yml b/classes/cluster/mk22_lab_basic/openstack/control.yml
@@ -50,17 +50,23 @@ parameters:
   keystone:
     server:
       admin_email: ${_param:admin_email}
-      notification: true
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
   glance:
     server:
       storage:
         engine: file
       images: []
       workers: 1
-      notification: true
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
   heat:
     server:
-      notification: true
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
   nova:
     controller:
       networking: contrail
@@ -77,17 +83,25 @@ parameters:
         - host: 127.0.0.1
           port: 11211
       workers: 1
-      notification: true
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
   neutron:
     server:
       plugin: contrail
       tunnel_type: vxlan
       public_networks: []
       contrail:
         version: ${_param:opencontrail_version}
-      notification: true
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
   cinder:
     volume:
-      notification: true
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
     controller:
-      notification: true
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
diff --git a/classes/cluster/mk22_lab_basic/stacklight/init.yml b/classes/cluster/mk22_lab_basic/stacklight/init.yml
@@ -23,6 +23,7 @@ parameters:
     nagios_notification_from: 'nagios@localhost'
     nagios_notification_email: 'root@localhost'
     stacklight_environment: ${_param:cluster_domain}
+    stacklight_notification_topic: stacklight_notifications
   linux:
     network:
       host:

diff --git a/classes/cluster/mk22_lab_basic/stacklight/server.yml b/classes/cluster/mk22_lab_basic/stacklight/server.yml
@@ -1,6 +1,7 @@
 classes:
 - system.collectd.remote_client.single
 - system.heka.remote_collector.single
+- system.heka.remote_collector.input.amqp
 - system.heka.aggregator.single
 - system.elasticsearch.server.single
 - system.elasticsearch.server.curator