openstack/fuel-library
Code Issues Proposed changes

Fix merge: DEBUG to PUPPET_AGENT_COMMAND

Browse Source 
Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>
This commit is contained in:
Bogdan Dobrelya
2013-05-27 15:19:03 +03:00
parent 1c884e834c
commit 2604172cfb
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fuel_test/README.rst
View File

@@ -60,7 +60,7 @@ Other shell script keys
- USE_ISO = use ISO for deployment (default ``True``), note: this option is broken
- ASTUTE_USE = use astute addon for mcollective to deploy nodes (default ``True``)
- PUPPET_GEN = puppet generation ``(2,3)`` to use, i.e. ``2 => v2.x.x``, ``3 => v3.x.x`` (default ``3``)
- DEBUG = run puppet agents with ``-tvd -evaltrace`` args
- PUPPET_AGENT_COMMAND = command to run puppet agents (default ``puppet agent -tvd -evaltrace 2>&1``)
- CLEAN = clean exitsting dirty state, will revert nodes to snapshot ``nodes-deployed``, if any (default ``True``)
- CREATE_SNAPSHOTS = make ``openstack`` snapshots after lab have deployed or ``openstack-upgraded`` in case of upgrade (default ``False``)
- UPGRADE = tell jenkins to revert nodes to ``openstack`` snapshots while cleaning (default ``False``)
@@ -74,7 +74,7 @@ Shell script example
. ~/work/venv/bin/activate
export ENV_NAME=$JOB_NAME
export DEBUG=true
export PUPPET_AGENT_COMMAND='puppet agent -t 2>&1'
export CREATE_SNAPSHOTS=true
export UPGRADE=false
export CLEAN=true

16
fuel_test/cobbler/test_minimal.py
View File

@@ -3,7 +3,7 @@ from fuel_test.cobbler.vm_test_case import CobblerTestCase
from fuel_test.config import Config
from fuel_test.helpers import write_config
from fuel_test.manifest import Template, Manifest
from fuel_test.settings import CREATE_SNAPSHOTS, ASTUTE_USE, DEBUG
from fuel_test.settings import CREATE_SNAPSHOTS, ASTUTE_USE, PUPPET_AGENT_COMMAND
class MinimalTestCase(CobblerTestCase):
@@ -21,16 +21,10 @@ class MinimalTestCase(CobblerTestCase):
controllers=self.nodes().controllers,
quantums=self.nodes().quantums,
quantum=True)
if DEBUG:
extargs = ' -vd --evaltrace'
else:
extargs = ''
self.validate(self.nodes().controllers[:1], 'puppet agent --test'+extargs+' 2>&1')
self.validate(self.nodes().controllers[1:], 'puppet agent --test'+extargs+' 2>&1')
self.validate(self.nodes().controllers[:1], 'puppet agent --test'+extargs+' 2>&1')
#if is_not_essex():
# self.validate(self.nodes().quantums, 'puppet agent --test'+extargs)
self.validate(self.nodes().computes, 'puppet agent --test'+extargs+' 2>&1')
self.validate(self.nodes().controllers[:1], PUPPET_AGENT_COMMAND)
self.validate(self.nodes().controllers[1:], PUPPET_AGENT_COMMAND)
self.validate(self.nodes().controllers[:1], PUPPET_AGENT_COMMAND)
self.validate(self.nodes().computes, PUPPET_AGENT_COMMAND)
def deploy_by_astute(self):
self.remote().check_stderr("astute -f /root/astute.yaml -v")