From f426660f750a32a106d262564f37134dc0b4ec4a Mon Sep 17 00:00:00 2001 From: Daniel Mellado Date: Thu, 13 Oct 2016 13:18:31 +0300 Subject: [PATCH] Split profile tox env Creates a new tox env called profile in order for profiling not to be mandatory for each workload run. Change-Id: I699551f1d50776499ad67440bc0a6b71bd8101ef --- ansible/lampstack/ansible.cfg | 1 - tox.ini | 17 +++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ansible/lampstack/ansible.cfg b/ansible/lampstack/ansible.cfg index f9b18f9..a5fa946 100644 --- a/ansible/lampstack/ansible.cfg +++ b/ansible/lampstack/ansible.cfg @@ -1,4 +1,3 @@ [defaults] inventory = ./hosts host_key_checking = False -callback_whitelist = profile_tasks diff --git a/tox.ini b/tox.ini index 2abd3d3..f945be1 100644 --- a/tox.ini +++ b/tox.ini @@ -8,17 +8,22 @@ skipsdist = True sitepackages = False setenv = VIRTUAL_ENV={envdir} + LAMPSTACK_DIR = {toxinidir}/ansible/lampstack ANSIBLE_HOST_KEY_CHECKING = False ANSIBLE_SSH_CONTROL_PATH = /tmp/%%h-%%r + ANSIBLE_INVENTORY = {env:LAMPSTACK_DIR}/hosts + ANSIBLE_CONFIG = {env:LAMPSTACK_DIR}/ansible.cfg deps = setuptools -r{toxinidir}/ansible_requirements.txt [testenv:lampstack] setenv = - LAMPSTACK_DIR = {toxinidir}/ansible/lampstack - ANSIBLE_CONFIG = {env:LAMPSTACK_DIR}/ansible.cfg - ANSIBLE_LOCAL_TEMP = {env:LAMPSTACK_DIR}/.ansible/tmp - ANSIBLE_REMOTE_TEMP = {env:LAMPSTACK_DIR}/.ansible/tmp - ANSIBLE_INVENTORY = {env:LAMPSTACK_DIR}/hosts -commands = ansible-playbook -vvvv -e "action=apply {posargs}" {env:LAMPSTACK_DIR}/site.yml + {[testenv]setenv} +commands = ansible-playbook -vvv -e "action=apply {posargs}" {env:LAMPSTACK_DIR}/site.yml + +[testenv:profile] +setenv = + {[testenv]setenv} + ANSIBLE_CALLBACK_WHITELIST = profile_tasks +commands = ansible-playbook -vvv -e "action=apply {posargs}" {env:LAMPSTACK_DIR}/site.yml