Merge "Transform instance.rebuild_scheduled notification"

2018-07-14 17:20:16 +00:00
parent 21a368e1a6 ab2279eb09
commit 039f7e055e
13 changed files with 83 additions and 32 deletions
@@ -1,6 +1,8 @@
 {
    "$ref": "InstanceActionPayload.json",
    "nova_object.data": {
+        "architecture": null,
+        "image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c",
        "trusted_image_certificates": [
            "rebuild-cert-id-1",
            "rebuild-cert-id-2"
@@ -1,12 +1,6 @@
 {
    "event_type": "instance.rebuild.end",
    "publisher_id": "nova-compute:compute",
-    "payload": {
-        "$ref":"common_payloads/InstanceActionRebuildPayload.json#",
-        "nova_object.data": {
-            "architecture": null,
-            "image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c"
-        }
-    },
+    "payload": {"$ref": "common_payloads/InstanceActionRebuildPayload.json#"},
    "priority": "INFO"
 }
@@ -15,8 +15,6 @@
                "nova_object.version": "1.1",
                "nova_object.namespace": "nova"
            },
-            "architecture": null,
-            "image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c",
            "task_state": "rebuilding"
        }
    },
@@ -3,10 +3,8 @@
    "event_type": "instance.rebuild.start",
    "publisher_id": "nova-compute:compute",
    "payload": {
-        "$ref":"common_payloads/InstanceActionRebuildPayload.json#",
+        "$ref": "common_payloads/InstanceActionRebuildPayload.json#",
        "nova_object.data": {
-            "architecture": null,
-            "image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c",
            "task_state": "rebuilding"
        }
    }
@@ -0,0 +1,11 @@
+{
+    "priority": "INFO",
+    "event_type": "instance.rebuild_scheduled",
+    "publisher_id": "nova-conductor:compute",
+    "payload": {
+        "$ref": "common_payloads/InstanceActionRebuildPayload.json#",
+        "nova_object.data": {
+            "task_state": "rebuilding"
+        }
+    }
+}