From beb0312c688d908f065c46a91f92c5125ed6a796 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Wed, 30 Sep 2015 00:33:03 +0200 Subject: [PATCH] Passing calling commands with subprocess. --- local.yml | 1 + roles/init/tasks/main.yml | 1 + roles/prereq/templates/checksum.fact | 7 ++++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/local.yml b/local.yml index 81ba571..04899cf 100644 --- a/local.yml +++ b/local.yml @@ -5,6 +5,7 @@ vars_files: - domainpwd.vault roles: + - checkver - init - base - custom diff --git a/roles/init/tasks/main.yml b/roles/init/tasks/main.yml index a0e449d..a39894d 100644 --- a/roles/init/tasks/main.yml +++ b/roles/init/tasks/main.yml @@ -1,5 +1,6 @@ --- - 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 f11bb6b..c4d2ab5 100644 --- a/roles/prereq/templates/checksum.fact +++ b/roles/prereq/templates/checksum.fact @@ -1,6 +1,6 @@ #!/usr/bin/env python -from os import popen +from subprocess import Popen, PIPE, STDOUT from os.path import isfile from json import dumps, loads from hashlib import md5 @@ -15,8 +15,9 @@ local_repo_hash = '' live_repo_hash = '' # Getting live versions for repo -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() +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.close() live_pkg_hash = ''