Skip to content

Commit

Permalink
Set instance.availability_zone whenever we schedule
Browse files Browse the repository at this point in the history 
This ensures that instance.availability_zone reflects what AZ the
instance is actually in. In the case where no AZ was requested at
boot, previously this would always be some default value, which
isn't as useful to the things that need to consider what AZ the
instance is actually in (without doing all the aggregate math to
determine it on the fly).

Related to blueprint cells-aware-api
Change-Id: I8d426f2635232ffc4b510548a905794ca88d7f99
  • Loading branch information
@kk7ds
kk7ds committed Mar 23, 2017
1 parent b9d4bc9 commit 03b4c67
Show file tree
Hide file tree
Showing 47 changed files with 104 additions and 69 deletions.
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-create-end.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-create-error.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-create-start.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-delete-end.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":"2012-10-29T13:42:11Z",
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-delete-start.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-pause-end.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-pause-start.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-power_off-end.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-power_off-start.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-power_on-end.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-power_on-start.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
4 changes: 2 additions & 2 deletions doc/notification_samples/instance-reboot-end.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":null,
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down Expand Up @@ -71,4 +71,4 @@
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"
}
}
4 changes: 2 additions & 2 deletions doc/notification_samples/instance-reboot-error.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture": null,
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down Expand Up @@ -81,4 +81,4 @@
},
"priority":"ERROR",
"publisher_id":"nova-compute:compute"
}
}
4 changes: 2 additions & 2 deletions doc/notification_samples/instance-reboot-start.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":null,
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down Expand Up @@ -71,4 +71,4 @@
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"
}
}
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-rebuild-end.json
View file
Expand Up @@ -62,7 +62,7 @@
"os_type": null,
"uuid": "b271fcb9-75c3-4c76-84eb-6ccad1150ece",
"locked": false,
"availability_zone": null,
"availability_zone": "nova",
"ramdisk_id": "",
"architecture": null,
"progress": 0,
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-rebuild-error.json
View file
Expand Up @@ -4,7 +4,7 @@
"nova_object.name": "InstanceActionPayload",
"nova_object.data": {
"state": "active",
"availability_zone": null,
"availability_zone": "nova",
"kernel_id": "",
"host_name": "some-server",
"progress": 0,
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-rebuild-start.json
View file
Expand Up @@ -64,7 +64,7 @@
}
],
"tenant_id": "6f70656e737461636b20342065766572",
"availability_zone": null,
"availability_zone": "nova",
"host": "compute",
"image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c",
"state": "active",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-resize-end.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-resize-start.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-resize_finish-end.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-resize_finish-start.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-restore-end.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-restore-start.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-resume-end.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-resume-start.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-shelve-end.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-shelve-start.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-shelve_offload-end.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-shelve_offload-start.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-shutdown-end.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-shutdown-start.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-snapshot-end.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-snapshot-start.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-suspend-end.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-suspend-start.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-unpause-end.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-unpause-start.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-unshelve-end.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-unshelve-start.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload":{
"nova_object.data":{
"architecture":"x86_64",
"availability_zone":null,
"availability_zone": "nova",
"created_at":"2012-10-29T13:42:11Z",
"deleted_at":null,
"display_name":"some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-update.json
View file
Expand Up @@ -11,7 +11,7 @@
"nova_object.namespace": "nova",
"nova_object.version": "1.0"
},
"availability_zone": null,
"availability_zone": "nova",
"bandwidth": [],
"created_at": "2012-10-29T13:42:11Z",
"deleted_at": null,
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-volume_swap-end.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload": {
"nova_object.data": {
"architecture": "x86_64",
"availability_zone": null,
"availability_zone": "nova",
"created_at": "2012-10-29T13:42:11Z",
"deleted_at": null,
"display_name": "some-server",
Expand Down
2 changes: 1 addition & 1 deletion doc/notification_samples/instance-volume_swap-error.json
View file
Expand Up @@ -3,7 +3,7 @@
"payload": {
"nova_object.data": {
"architecture": "x86_64",
"availability_zone": null,
"availability_zone": "nova",
"created_at": "2012-10-29T13:42:11Z",
"deleted_at": null,
"display_name": "some-server",
Expand Down

0 comments on commit 03b4c67

Please sign in to comment.