openstack
/
nova
Code Issues Proposed changes

Fix nits from trusted certs notification change 

This is a follow up to address a few nits in change
Ib5b50a3889ab15d5aac992f92e9be372a915eeff.

Change-Id: I08ce4a9f5bb33761d8c5ff82ef9faf874ac97fcc
This commit is contained in:
Matt Riedemann 2018-06-14 14:30:30 -04:00
parent 27ca2e3343
commit dc9fb5842c
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/notifications/objects/instance.py
View File

@ -236,7 +236,7 @@ class InstanceCreatePayload(InstanceActionPayload):
self.tags = [instance_tag.tag
for instance_tag in instance.tags]
self.trusted_image_certificates = None
if instance.get("trusted_certs", None):
if instance.trusted_certs:
self.trusted_image_certificates = instance.trusted_certs.ids
@ -322,14 +322,14 @@ class InstanceActionRebuildPayload(InstanceActionPayload):
nullable=True)
}
def __init__(self, context, instance, fault, bdms):
def __init__(self, context, instance, fault, bdms=None):
super(InstanceActionRebuildPayload, self).__init__(
context=context,
instance=instance,
fault=fault,
bdms=bdms)
self.trusted_image_certificates = None
if instance.get("trusted_certs", None):
if instance.trusted_certs:
self.trusted_image_certificates = instance.trusted_certs.ids

18
releasenotes/notes/trusted-certs-microversion-589b75f0180d4d51.yaml
View File

@ -30,17 +30,17 @@ features:
* ``POST /servers/{server_id}/action (rebuild)``
The payload of the ``instance.create.start`` and ``instance.create.end``
and ``instance.create.error`` notifications have been extended with the
``trusted_image_certificates`` field that contains the list of trusted
certificate IDs used when the instance is created.
and ``instance.create.error`` versioned notifications have been extended
with the ``trusted_image_certificates`` field that contains the list of
trusted certificate IDs used when the instance is created.
The payload of the ``instance.rebuild.start`` and ``instance.rebuild.end``
and ``instance.rebuild.error`` notifications have been extended with the
``trusted_image_certificates`` field that contains the list of trusted
certificate IDs used when the instance is rebuilt. This change also causes
the type of the payload object to change from ``InstanceActionPayload``
version 1.6 to ``InstanceActionRebuildPayload`` version 1.7. See the
`notification dev reference`_ for the sample file of
and ``instance.rebuild.error`` versioned notifications have been extended
with the ``trusted_image_certificates`` field that contains the list of
trusted certificate IDs used when the instance is rebuilt. This change also
causes the type of the payload object to change from
``InstanceActionPayload`` version 1.6 to ``InstanceActionRebuildPayload``
version 1.7. See the `notification dev reference`_ for the sample file of
``instance.rebuild.start`` as an example.
.. _notification dev reference: https://docs.openstack.org/developer/nova/notifications.html