From 489d1573c41e6852880db78c548d34d8f4e29edf Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Wed, 9 Jan 2019 13:01:28 +0100 Subject: [PATCH] Set pyvers in defaults This allows openstacklib::defaults to be inherited by each component module avoiding duplicating the logic currently required when setting this for the various base distrobutions. Change-Id: I84b767921d151a61429b2c89e6372c4b447f0d7d --- manifests/defaults.pp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/manifests/defaults.pp b/manifests/defaults.pp index f2539377..40d6124b 100644 --- a/manifests/defaults.pp +++ b/manifests/defaults.pp @@ -12,4 +12,16 @@ class openstacklib::defaults { warning('OpenStack modules support for Puppet 4 is deprecated \ and will be officially unsupported in the T release') } + + if ($::os['family'] == 'Debian') { + $pyvers = '3' + $pyver3 = '3' + } elsif ($::os['name'] == 'Fedora') or + ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) { + $pyvers = '3' + $pyver3 = '3.6' + } else { + $pyvers = '' + $pyver3 = '2.7' + } }