From 160c018fd9a35babffc9e0eb853d9ae815d3d33f Mon Sep 17 00:00:00 2001 From: Jens Harbott Date: Tue, 6 Feb 2018 15:26:28 +0000 Subject: [PATCH] Updates for pike and chef13 --- metadata.rb | 2 +- recipes/common.rb | 2 +- recipes/identity_registration.rb | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/metadata.rb b/metadata.rb index 11c1665..8aa9ac9 100644 --- a/metadata.rb +++ b/metadata.rb @@ -7,7 +7,7 @@ source_url 'https://github.com/cloudbau/cookbook-openstack-dns' if respond_to?(: license 'Apache 2.0' description 'Installs and configures the Designate Service' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.2.0' +version '1.0.0' %w(ubuntu redhat centos).each do |os| supports os diff --git a/recipes/common.rb b/recipes/common.rb index fbef299..ada5853 100644 --- a/recipes/common.rb +++ b/recipes/common.rb @@ -78,7 +78,7 @@ auth_url = auth_uri_transform identity_endpoint.to_s, node['openstack']['dns'][' # define attributes that are needed in designate.conf node.default['openstack']['dns']['conf'].tap do |conf| conf['service:api']['api_host'] = bind_address api_bind - conf['service:api']['api_port'] = api_bind.port + conf['service:api']['api_port'] = api_bind['port'] conf['keystone_authtoken']['auth_uri'] = public_identity_endpoint conf['keystone_authtoken']['auth_url'] = auth_url end diff --git a/recipes/identity_registration.rb b/recipes/identity_registration.rb index a803fee..d307b1d 100644 --- a/recipes/identity_registration.rb +++ b/recipes/identity_registration.rb @@ -70,6 +70,7 @@ end # Register DNS Internal-Endpoint openstack_endpoint service_type do service_name service_name + interface 'internal' url internal_designate_endpoint.to_s region region connection_params connection_params