From 2111e5a85f8d0a894e1a7684c2e1a6d897091c9d Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 14 Feb 2018 13:12:39 -0500 Subject: Fixes python2 docutils req and also installs ansible For some reason we were requiring python2-docutils in to build our rpm instead of python34-docutils. Patch also includes some logic to install ansible. JIRA: APEX-515 Change-Id: I1b85e5b4b29f74f5ff5399296f24831c334c289c Signed-off-by: Tim Rozet --- apex/common/utils.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'apex/common') diff --git a/apex/common/utils.py b/apex/common/utils.py index 13250a45..0328a3b5 100644 --- a/apex/common/utils.py +++ b/apex/common/utils.py @@ -8,6 +8,7 @@ ############################################################################## import datetime +import distro import json import logging import os @@ -192,3 +193,20 @@ def fetch_upstream_and_unpack(dest, url, targets): tar = tarfile.open(target_dest) tar.extractall(path=dest) tar.close() + + +def install_ansible(): + # we only install for CentOS/Fedora for now + dist = distro.id() + if 'centos' in dist: + pkg_mgr = 'yum' + elif 'fedora' in dist: + pkg_mgr = 'dnf' + else: + return + + # yum python module only exists for 2.x, so use subprocess + try: + subprocess.check_call([pkg_mgr, '-y', 'install', 'ansible']) + except subprocess.CalledProcessError: + logging.warning('Unable to install Ansible') -- cgit 1.2.3-korg