diff --git a/magnum/conductor/handlers/common/cert_manager.py b/magnum/conductor/handlers/common/cert_manager.py index 772dcd4817..cd03bb5ef1 100644 --- a/magnum/conductor/handlers/common/cert_manager.py +++ b/magnum/conductor/handlers/common/cert_manager.py @@ -86,12 +86,12 @@ def generate_certificates_to_bay(bay): def get_bay_ca_certificate(bay): - ca_cert = cert_manager.get_backend().CertManager.get_cert(bay.ca_cert_uuid) + ca_cert = cert_manager.get_backend().CertManager.get_cert(bay.ca_cert_ref) return ca_cert.get_certificate() def sign_node_certificate(bay, csr): - ca_cert = cert_manager.get_backend().CertManager.get_cert(bay.ca_cert_uuid) + ca_cert = cert_manager.get_backend().CertManager.get_cert(bay.ca_cert_ref) node_cert = x509.sign(csr, bay.name, ca_cert.get_private_key(), ca_cert.get_private_key_passphrase()) return node_cert diff --git a/magnum/tests/unit/conductor/handlers/common/test_cert_manager.py b/magnum/tests/unit/conductor/handlers/common/test_cert_manager.py index 12989c5507..6fb9c498d1 100644 --- a/magnum/tests/unit/conductor/handlers/common/test_cert_manager.py +++ b/magnum/tests/unit/conductor/handlers/common/test_cert_manager.py @@ -138,7 +138,7 @@ class CertManagerTestCase(base.BaseTestCase): bay_ca_cert = cert_manager.sign_node_certificate(mock_bay, mock_csr) self.CertManager.get_cert.assert_called_once_with( - mock_bay.ca_cert_uuid) + mock_bay.ca_cert_ref) mock_x509_sign.assert_called_once_with(mock_csr, mock_bay.name, mock.sentinel.priv_key, passphrase) @@ -153,5 +153,5 @@ class CertManagerTestCase(base.BaseTestCase): bay_ca_cert = cert_manager.get_bay_ca_certificate(mock_bay) self.CertManager.get_cert.assert_called_once_with( - mock_bay.ca_cert_uuid) + mock_bay.ca_cert_ref) self.assertEqual(bay_ca_cert, mock.sentinel.certificate)