Merge pull request #21 from simonpasquier/rationalize-notification-configuration

Rationalize notification configuration
diff --git a/cinder/control/notification/messagingv2.yml b/cinder/control/notification/messagingv2.yml
new file mode 100644
index 0000000..8fb1172
--- /dev/null
+++ b/cinder/control/notification/messagingv2.yml
@@ -0,0 +1,6 @@
+parameters:
+  cinder:
+    controller:
+      notification:
+        driver: messagingv2
+        topics: "${_param:openstack_notification_topics}"
diff --git a/cinder/volume/notification/messagingv2.yml b/cinder/volume/notification/messagingv2.yml
new file mode 100644
index 0000000..4ccbdd8
--- /dev/null
+++ b/cinder/volume/notification/messagingv2.yml
@@ -0,0 +1,6 @@
+parameters:
+  cinder:
+    volume:
+      notification:
+        driver: messagingv2
+        topics: "${_param:openstack_notification_topics}"
diff --git a/glance/control/notification/messagingv2.yml b/glance/control/notification/messagingv2.yml
new file mode 100644
index 0000000..7020add
--- /dev/null
+++ b/glance/control/notification/messagingv2.yml
@@ -0,0 +1,6 @@
+parameters:
+  glance:
+    server:
+      notification:
+        driver: messagingv2
+        topics: "${_param:openstack_notification_topics}"
diff --git a/heat/server/notification/messagingv2.yml b/heat/server/notification/messagingv2.yml
new file mode 100644
index 0000000..eff5141
--- /dev/null
+++ b/heat/server/notification/messagingv2.yml
@@ -0,0 +1,6 @@
+parameters:
+  heat:
+    server:
+      notification:
+        driver: messagingv2
+        topics: "${_param:openstack_notification_topics}"
diff --git a/heat/server/single.yml b/heat/server/single.yml
index 3c4b5f3..d097605 100644
--- a/heat/server/single.yml
+++ b/heat/server/single.yml
@@ -3,7 +3,6 @@
 parameters:
   heat:
     server:
-      notification: true
       stack_domain_admin:
         name: heat_domain_admin
         password: ${_param:heat_domain_admin_password}
diff --git a/keystone/server/notification/messagingv2.yml b/keystone/server/notification/messagingv2.yml
new file mode 100644
index 0000000..2cc7e64
--- /dev/null
+++ b/keystone/server/notification/messagingv2.yml
@@ -0,0 +1,6 @@
+parameters:
+  keystone:
+    server:
+      notification:
+        driver: messagingv2
+        topics: "${_param:openstack_notification_topics}"
diff --git a/neutron/compute/notification/messagingv2.yml b/neutron/compute/notification/messagingv2.yml
new file mode 100644
index 0000000..0e9d34a
--- /dev/null
+++ b/neutron/compute/notification/messagingv2.yml
@@ -0,0 +1,6 @@
+parameters:
+  neutron:
+    compute:
+      notification:
+        driver: messagingv2
+        topics: "${_param:openstack_notification_topics}"
diff --git a/neutron/control/notification/messagingv2.yml b/neutron/control/notification/messagingv2.yml
new file mode 100644
index 0000000..70e8618
--- /dev/null
+++ b/neutron/control/notification/messagingv2.yml
@@ -0,0 +1,6 @@
+parameters:
+  neutron:
+    server:
+      notification:
+        driver: messagingv2
+        topics: "${_param:openstack_notification_topics}"
diff --git a/neutron/gateway/notification/messagingv2.yml b/neutron/gateway/notification/messagingv2.yml
new file mode 100644
index 0000000..6363c39
--- /dev/null
+++ b/neutron/gateway/notification/messagingv2.yml
@@ -0,0 +1,6 @@
+parameters:
+  neutron:
+    gateway:
+      notification:
+        driver: messagingv2
+        topics: "${_param:openstack_notification_topics}"
diff --git a/nova/compute/notification/messagingv2.yml b/nova/compute/notification/messagingv2.yml
new file mode 100644
index 0000000..59ec94d
--- /dev/null
+++ b/nova/compute/notification/messagingv2.yml
@@ -0,0 +1,8 @@
+parameters:
+  nova:
+    compute:
+      notification:
+        driver: messagingv2
+        topics: "${_param:openstack_notification_topics}"
+        notify_on:
+          state_change: vm_and_task_state
diff --git a/nova/control/notification/messagingv2.yml b/nova/control/notification/messagingv2.yml
new file mode 100644
index 0000000..5ed8013
--- /dev/null
+++ b/nova/control/notification/messagingv2.yml
@@ -0,0 +1,6 @@
+parameters:
+  nova:
+    controller:
+      notification:
+        driver: messagingv2
+        topics: "${_param:openstack_notification_topics}"