summaryrefslogtreecommitdiffstats
path: root/apex
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-02-14 13:12:39 -0500
committerTim Rozet <trozet@redhat.com>2018-02-15 12:00:05 -0500
commit2111e5a85f8d0a894e1a7684c2e1a6d897091c9d (patch)
tree02b929082ab790d524696a08cd1102814a9e92f8 /apex
parent1f6ee5a99cb191afde06695e449c53732453b222 (diff)
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 <trozet@redhat.com>
Diffstat (limited to 'apex')
-rw-r--r--apex/build.py1
-rw-r--r--apex/common/utils.py18
-rw-r--r--apex/deploy.py1
3 files changed, 20 insertions, 0 deletions
diff --git a/apex/build.py b/apex/build.py
index 08f91ab..dff25ac 100644
--- a/apex/build.py
+++ b/apex/build.py
@@ -225,6 +225,7 @@ def main():
console.setLevel(log_level)
console.setFormatter(logging.Formatter(formatter))
logging.getLogger('').addHandler(console)
+ utils.install_ansible()
# Since we only support building inside of git repo this should be fine
try:
apex_root = subprocess.check_output(
diff --git a/apex/common/utils.py b/apex/common/utils.py
index 13250a4..0328a3b 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')
diff --git a/apex/deploy.py b/apex/deploy.py
index d2f7d50..5171c5c 100644
--- a/apex/deploy.py
+++ b/apex/deploy.py
@@ -234,6 +234,7 @@ def main():
console.setLevel(log_level)
console.setFormatter(logging.Formatter(formatter))
logging.getLogger('').addHandler(console)
+ utils.install_ansible()
validate_deploy_args(args)
# Parse all settings
deploy_settings = DeploySettings(args.deploy_settings_file)