From 96a48ab04b6d28908dd3a0c5b64138359b9e1a23 Mon Sep 17 00:00:00 2001 From: zhubingbing Date: Thu, 12 Apr 2018 10:51:41 +0800 Subject: [PATCH] Debian is using python3-designateclient Change-Id: I55b1d17a2bee2ba4f4b2195c9f58a64c9cad9a77 --- manifests/params.pp | 8 +++++++- spec/classes/designate_client_spec.rb | 6 +++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 17ed7980..1f69717e 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -5,9 +5,15 @@ class designate::params { include ::openstacklib::defaults + if ($::os_package_type == 'debian') { + $pyvers = '3' + } else { + $pyvers = '' + } + $state_path = '/var/lib/designate' $log_dir = '/var/log/designate' - $client_package_name = 'python-designateclient' + $client_package_name = "python${pyvers}-designateclient" $agent_service_name = 'designate-agent' $api_service_name = 'designate-api' $central_service_name = 'designate-central' diff --git a/spec/classes/designate_client_spec.rb b/spec/classes/designate_client_spec.rb index 32b187a4..49e448b6 100644 --- a/spec/classes/designate_client_spec.rb +++ b/spec/classes/designate_client_spec.rb @@ -49,7 +49,11 @@ describe 'designate::client' do let(:platform_params) do case facts[:osfamily] when 'Debian' - { :client_package_name => 'python-designateclient' } + if facts[:os_package_type] == 'debian' + { :client_package_name => 'python3-designateclient' } + else + { :client_package_name => 'python-designateclient' } + end when 'RedHat' { :client_package_name => 'python-designateclient' } end