From 8c75008b23aefd04c888f5a654c3317df3c00b33 Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Tue, 24 Jul 2018 13:00:52 +0200 Subject: [PATCH] Replace references to `keystone-common` with `keystone` The `keystone-common` package no longer exist and using it for OpenStack release comparison will not produce expected results. Change-Id: I263c408679759971265d721cdd66ae9ea7d481d8 --- hooks/keystone_hooks.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hooks/keystone_hooks.py b/hooks/keystone_hooks.py index cfd938e2..51736aa7 100755 --- a/hooks/keystone_hooks.py +++ b/hooks/keystone_hooks.py @@ -309,7 +309,7 @@ def update_all_domain_backends(): def update_all_fid_backends(): - if CompareOpenStackReleases(os_release('keystone-common')) < 'ocata': + if CompareOpenStackReleases(os_release('keystone')) < 'ocata': log('Ignoring keystone-fid-service-provider relation as it is' ' not supported on releases older than Ocata') return @@ -361,7 +361,7 @@ def db_changed(): CONFIGS.write(KEYSTONE_CONF) leader_init_db_if_ready(use_current_context=True) if CompareOpenStackReleases( - os_release('keystone-common')) >= 'liberty': + os_release('keystone')) >= 'liberty': CONFIGS.write(POLICY_JSON) update_all_identity_relation_units() @@ -716,7 +716,7 @@ def keystone_fid_service_provider_changed(): if get_api_version() < 3: log('Identity federation is only supported with keystone v3') return - if CompareOpenStackReleases(os_release('keystone-common')) < 'ocata': + if CompareOpenStackReleases(os_release('keystone')) < 'ocata': log('Ignoring keystone-fid-service-provider relation as it is' ' not supported on releases older than Ocata') return @@ -746,7 +746,7 @@ def keystone_fid_service_provider_changed(): @hooks.hook('keystone-fid-service-provider-relation-broken') def keystone_fid_service_provider_broken(): - if CompareOpenStackReleases(os_release('keystone-common')) < 'ocata': + if CompareOpenStackReleases(os_release('keystone')) < 'ocata': log('Ignoring keystone-fid-service-provider relation as it is' ' not supported on releases older than Ocata') return @@ -762,7 +762,7 @@ def websso_trusted_dashboard_changed(): if get_api_version() < 3: log('WebSSO is only supported with keystone v3') return - if CompareOpenStackReleases(os_release('keystone-common')) < 'ocata': + if CompareOpenStackReleases(os_release('keystone')) < 'ocata': log('Ignoring WebSSO relation as it is not supported on' ' releases older than Ocata') return