summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhubingbing <zhu.bingbing@99cloud.net>2018-04-12 10:51:41 +0800
committerzhubingbing <zhu.bingbing@99cloud.net>2018-04-12 11:14:53 +0800
commit96a48ab04b6d28908dd3a0c5b64138359b9e1a23 (patch)
treeabda0ba2b4bc4fe82d8cc823391d99ed469dcaae
parenta936ea01ff3a1500268be1a01b5d6cc471dd011c (diff)
Debian is using python3-designateclient
Notes
Notes (review): Code-Review+2: zhongshengping <chdzsp@163.com> Code-Review+2: Alex Schultz <aschultz@redhat.com> Workflow+1: Alex Schultz <aschultz@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 13 Apr 2018 06:23:44 +0000 Reviewed-on: https://review.openstack.org/560717 Project: openstack/puppet-designate Branch: refs/heads/master
-rw-r--r--manifests/params.pp8
-rw-r--r--spec/classes/designate_client_spec.rb6
2 files changed, 12 insertions, 2 deletions
diff --git a/manifests/params.pp b/manifests/params.pp
index 17ed798..1f69717 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -5,9 +5,15 @@
5class designate::params { 5class designate::params {
6 include ::openstacklib::defaults 6 include ::openstacklib::defaults
7 7
8 if ($::os_package_type == 'debian') {
9 $pyvers = '3'
10 } else {
11 $pyvers = ''
12 }
13
8 $state_path = '/var/lib/designate' 14 $state_path = '/var/lib/designate'
9 $log_dir = '/var/log/designate' 15 $log_dir = '/var/log/designate'
10 $client_package_name = 'python-designateclient' 16 $client_package_name = "python${pyvers}-designateclient"
11 $agent_service_name = 'designate-agent' 17 $agent_service_name = 'designate-agent'
12 $api_service_name = 'designate-api' 18 $api_service_name = 'designate-api'
13 $central_service_name = 'designate-central' 19 $central_service_name = 'designate-central'
diff --git a/spec/classes/designate_client_spec.rb b/spec/classes/designate_client_spec.rb
index 32b187a..49e448b 100644
--- a/spec/classes/designate_client_spec.rb
+++ b/spec/classes/designate_client_spec.rb
@@ -49,7 +49,11 @@ describe 'designate::client' do
49 let(:platform_params) do 49 let(:platform_params) do
50 case facts[:osfamily] 50 case facts[:osfamily]
51 when 'Debian' 51 when 'Debian'
52 { :client_package_name => 'python-designateclient' } 52 if facts[:os_package_type] == 'debian'
53 { :client_package_name => 'python3-designateclient' }
54 else
55 { :client_package_name => 'python-designateclient' }
56 end
53 when 'RedHat' 57 when 'RedHat'
54 { :client_package_name => 'python-designateclient' } 58 { :client_package_name => 'python-designateclient' }
55 end 59 end