diff --git a/local.yml b/local.yml index 04899cf..81ba571 100644 --- a/local.yml +++ b/local.yml @@ -5,7 +5,6 @@ vars_files: - domainpwd.vault roles: - - checkver - init - base - custom diff --git a/roles/init/tasks/main.yml b/roles/init/tasks/main.yml index a39894d..a0e449d 100644 --- a/roles/init/tasks/main.yml +++ b/roles/init/tasks/main.yml @@ -1,6 +1,5 @@ --- - include: init.yml - when: live_repover != ansible_local.checksum.repover tags: - init diff --git a/roles/prereq/templates/checksum.fact b/roles/prereq/templates/checksum.fact index c4d2ab5..f11bb6b 100644 --- a/roles/prereq/templates/checksum.fact +++ b/roles/prereq/templates/checksum.fact @@ -1,6 +1,6 @@ #!/usr/bin/env python -from subprocess import Popen, PIPE, STDOUT +from os import popen from os.path import isfile from json import dumps, loads from hashlib import md5 @@ -15,9 +15,8 @@ local_repo_hash = '' live_repo_hash = '' # Getting live versions for repo -p = Popen("pushd %s >/dev/null; git log --pretty=oneline -1 | cut -d' ' -f 1; popd > /dev/null" % repo_path, shell=True, stdout=PIPE, stderr=STDOUT) -output = p.communicate()[0] -live_repo_hash = output.strip() +repover = popen("pushd %s >/dev/null; git log --pretty=oneline -1 | cut -d' ' -f 1; popd > /dev/null" % repo_path) +live_repo_hash = repover.read().strip() repover.close() live_pkg_hash = ''