summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Schultz <aschultz@redhat.com>2018-11-02 10:33:12 -0600
committerQuique Llorente <ellorent@redhat.com>2018-11-06 11:05:21 +0100
commit91e8bb8a3999e44ece9313a215160f4c0f2ef19f (patch)
tree766afdffe1c98077522da1fa0adf42f711c8dbce
parent4b71a3b5232e866e81076bf1747d4e2f1e6b3a35 (diff)
Install python3-designateclient in Fedora or RedHat > 7
Fedora repo [1] has python3 packages, start consuming those. [1] http://trunk.rdoproject.org/fedora/puppet-passed-ci/ Change-Id: I598a9bd07d739063c9e7461a960b448baaf0e44d
Notes
Notes (review): Code-Review+1: yatin <ykarel@redhat.com> Code-Review+1: Sorin Sbarnea <ssbarnea@redhat.com> Code-Review+2: Emilien Macchi <emilien@redhat.com> Code-Review+2: Tobias Urdin <tobias.urdin@binero.se> Workflow+1: Tobias Urdin <tobias.urdin@binero.se> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 06 Nov 2018 15:51:46 +0000 Reviewed-on: https://review.openstack.org/615235 Project: openstack/puppet-designate Branch: refs/heads/master
-rw-r--r--manifests/client.pp3
-rw-r--r--manifests/params.pp3
2 files changed, 3 insertions, 3 deletions
diff --git a/manifests/client.pp b/manifests/client.pp
index 0487f77..492e255 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -15,10 +15,9 @@
15class designate::client ( 15class designate::client (
16 $package_ensure = 'present', 16 $package_ensure = 'present',
17 $client_package_name = $::designate::params::client_package_name, 17 $client_package_name = $::designate::params::client_package_name,
18) { 18) inherits ::designate::params {
19 19
20 include ::designate::deps 20 include ::designate::deps
21 include ::designate::params
22 21
23 package { 'python-designateclient': 22 package { 'python-designateclient':
24 ensure => $package_ensure, 23 ensure => $package_ensure,
diff --git a/manifests/params.pp b/manifests/params.pp
index e63360a..cb6d8ad 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -5,7 +5,8 @@
5class designate::params { 5class designate::params {
6 include ::openstacklib::defaults 6 include ::openstacklib::defaults
7 7
8 if ($::os_package_type == 'debian') { 8 if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
9 ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7){
9 $pyvers = '3' 10 $pyvers = '3'
10 } else { 11 } else {
11 $pyvers = '' 12 $pyvers = ''