From f38cf1aadd82e0a4aa2b66449c2f36cc2b98f5e0 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 11 Mar 2016 11:21:21 +0000 Subject: [PATCH] Resolve oslo & keystone deprecations/misconfigurations This patch implements: - A fix to the keystone_authtoken section to ensure that the correct URL is used to interact with the Keystone admin service. - The updated messaging configuration due to the oslo_config deprecation of 'notification_topics'. - The updated keystone_authtoken configuration due to the deprecation of 'auth_plugin'. - A conditional to include the Ceilometer notification driver only if the boolean 'designate_ceilometer_enabled' evaluates to True. --- defaults/main.yml | 2 +- templates/designate.conf.j2 | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 4c80917..a6724d3 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -94,7 +94,7 @@ designate_service_description: "DNS as a service" designate_service_project_domain_id: default designate_service_user_domain_id: default designate_service_user_name: designate -designate_keystone_auth_plugin: password +designate_keystone_auth_type: password designate_service_tenant_name: service designate_service_project_name: service designate_service_publicuri: "{{ designate_service_proto }}://{{ external_lb_vip_address }}:{{ designate_service_port }}" diff --git a/templates/designate.conf.j2 b/templates/designate.conf.j2 index 345b085..d45d408 100644 --- a/templates/designate.conf.j2 +++ b/templates/designate.conf.j2 @@ -2,8 +2,6 @@ auth_strategy = keystone verbose = {{ verbose }} debug = {{ debug }} -notification_driver = messaging -notification_topics = notifications [oslo_messaging_rabbit] rpc_backend = rabbit @@ -16,6 +14,10 @@ rabbit_use_ssl = {{ rabbitmq_use_ssl }} rabbit_notification_exchange = designate rabbit_notification_topic = notifications +{% if designate_ceilometer_enabled | bool %} +[oslo_messaging_notifications] +driver = messagingv2 +{% endif %} #----------------------- # Keystone Middleware @@ -23,9 +25,9 @@ rabbit_notification_topic = notifications [keystone_authtoken] insecure = {{ keystone_service_internaluri_insecure | bool }} -auth_plugin = {{ designate_keystone_auth_plugin }} +auth_type = {{ designate_keystone_auth_type }} signing_dir = {{ designate_system_user_home }}/cache/api -auth_url = {{ keystone_service_adminuri }} +auth_url = {{ keystone_service_adminurl }} auth_uri = {{ keystone_service_internaluri }} project_domain_id = {{ designate_service_project_domain_id }} user_domain_id = {{ designate_service_user_domain_id }}