From 91e8bb8a3999e44ece9313a215160f4c0f2ef19f Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Fri, 2 Nov 2018 10:33:12 -0600 Subject: [PATCH] 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 --- manifests/client.pp | 3 +-- manifests/params.pp | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/client.pp b/manifests/client.pp index 0487f774..492e2558 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -15,10 +15,9 @@ class designate::client ( $package_ensure = 'present', $client_package_name = $::designate::params::client_package_name, -) { +) inherits ::designate::params { include ::designate::deps - include ::designate::params package { 'python-designateclient': ensure => $package_ensure, diff --git a/manifests/params.pp b/manifests/params.pp index e63360ad..cb6d8ad5 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -5,7 +5,8 @@ class designate::params { include ::openstacklib::defaults - if ($::os_package_type == 'debian') { + if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or + ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7){ $pyvers = '3' } else { $pyvers = ''