diff --git a/glance/location.py b/glance/location.py index 436f16dadc..0f6f2c3e6c 100644 --- a/glance/location.py +++ b/glance/location.py @@ -421,8 +421,9 @@ class ImageProxy(glance.domain.proxy.Image): key_type = extra_props[signature_utils.KEY_TYPE] cert_uuid = extra_props[signature_utils.CERT_UUID] verifier = signature_utils.get_verifier( - self.context, cert_uuid, hash_method, - img_signature, key_type + context=self.context, cert_uuid=cert_uuid, + hash_method=hash_method, img_signature=img_signature, + key_type=key_type ) else: verifier = None diff --git a/releasenotes/notes/bug-1528349-c6b15d94845232da.yaml b/releasenotes/notes/bug-1528349-c6b15d94845232da.yaml deleted file mode 100644 index 839431c6a1..0000000000 --- a/releasenotes/notes/bug-1528349-c6b15d94845232da.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -prelude: > - Glance and Nova contain nearly identical digital signature modules. In - order to better maintain and evolve this code and to eliminate - the possibility that the modules diverge, we propose removing this code - and instead using the new cursive library. Please read the other section - for more details. -other: - - The cursive library is an OpenStack project which implements - OpenStack-specific verification of digital signatures. In Newton, the - majority of the signature verification code was removed from Glance. - Cursive has been added to Glance as a dependency and will be installed by - default. Glance uses the Cursive library's functionality to verify digital - signatures. To familiarize yourself with this new dependency and see the - list of transitive dependencies visit - https://github.com/openstack/cursive diff --git a/releasenotes/notes/use-cursive-c6b15d94845232da.yaml b/releasenotes/notes/use-cursive-c6b15d94845232da.yaml new file mode 100644 index 0000000000..307b090e63 --- /dev/null +++ b/releasenotes/notes/use-cursive-c6b15d94845232da.yaml @@ -0,0 +1,22 @@ +--- +other: + - | + Glance and Nova contain nearly identical digital + signature modules. In order to better maintain and + evolve this code and to eliminate the possibility that + the modules diverge, we have replaced the digital + signature module in Glance with the new ``cursive`` + library. + + * The ``cursive`` library is an OpenStack project which + implements OpenStack-specific verification of digital + signatures. + * In Newton, the majority of the signature verification + code was removed from Glance. ``cursive`` has been + added to Glance as a dependency and will be installed + by default. + * Glance uses the ``cursive`` library's functionality to + verify digital signatures. To familiarize yourself + with this new dependency and see the list of + transitive dependencies visit + http://git.openstack.org/cgit/openstack/cursive