From 61b240c48e9974b796cb8bbb968b4bc5af993078 Mon Sep 17 00:00:00 2001
From: Roger Luethi <rl@patchworkscience.org>
Date: Thu, 27 Sep 2018 14:01:00 +0200
Subject: [PATCH] Replace api_host/api_port with listen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

According to the Designate upgrade notes[1], the options api_host and
api_port have been deprecated with OpenStack Newton, and they do not
work with the Queens release.

[1] designate-api’s api_host and api_port configuration options have
    been deprecated, please use the new combined “listen” argument
    in place of these.
    https://docs.openstack.org/releasenotes/designate/newton.html

Change-Id: I04e9680e3b850b8a7cc5b7557c430e5453602956
---
 metadata.rb       | 2 +-
 recipes/common.rb | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/metadata.rb b/metadata.rb
index 4830955..7aae82c 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -8,7 +8,7 @@ license 'Apache-2.0'
 description 'Installs and configures the Designate Service'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 chef_version '>= 12.5' if respond_to?(:chef_version)
-version '17.0.1'
+version '17.0.2'
 
 %w(ubuntu redhat centos).each do |os|
   supports os
diff --git a/recipes/common.rb b/recipes/common.rb
index 956e373..3b6d320 100644
--- a/recipes/common.rb
+++ b/recipes/common.rb
@@ -71,8 +71,7 @@ identity_endpoint = internal_endpoint 'identity'
 # define attributes that are needed in designate.conf
 node.default['openstack']['dns']['conf'].tap do |conf|
   conf['database']['connection'] = sql_connection
-  conf['listen']['api_host'] = bind_address api_bind
-  conf['listen']['api_port'] = api_bind['port']
+  conf['service:api']['listen'] = "#{bind_address api_bind}:#{api_bind['port']}"
   conf['keystone_authtoken']['auth_url'] = identity_endpoint.to_s
   conf['keystone_authtoken']['www_authenticate_uri'] = identity_endpoint.to_s
 end