openstack/fuel-library
Code Issues Proposed changes

Merge "naming nodes in jenkins"

Browse Source
This commit is contained in:
Victor Galkin 2012-12-26 17:37:04 +04:00 committed by Gerrit Code Review
commit 21ece4d5fe
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fuel_test/ci/ci_cobbler.py
View File

@ -15,8 +15,13 @@ class CiCobbler(CiBase):
controller_names=['fuel-controller-%02d' % x for x in
range(1, 1 + COBBLER_CONTROLLERS)],
compute_names=['fuel-compute-%02d' % x for x in range(
COBBLER_CONTROLLERS + 1,
COBBLER_CONTROLLERS + 1 + COBBLER_COMPUTES)],
1, 1 + COBBLER_COMPUTES)],
storage_names=['fuel-swift-%02d' % x for x in range(
1, 1 + COBBLER_SWIFTS)],
proxy_names=['fuel-swiftproxy-%02d' % x for x in range(
1, 1 + COBBLER_PROXIES)],
quantum_names=['fuel-quantum'] if COBBLER_QUANTUM else [],
keystone_names=['keystone'] if COBBLER_KEYSTONE else [],
stomp_names=['fuel-mcollective']
)

9
fuel_test/settings.py
View File

@ -58,9 +58,12 @@ ADMIN_TENANT_ESSEX = 'openstack'
ADMIN_TENANT_FOLSOM = 'admin'
CIRROS_IMAGE ='http://srv08-srt.srt.mirantis.net/cirros-0.3.0-x86_64-disk.img'
COBBLER_CONTROLLERS = int(os.environ.get('COBBLER_CONTROLLERS', 2))
COBBLER_COMPUTES = int(os.environ.get('COBBLER_COMPUTES', 2))
COBBLER_CONTROLLERS = int(os.environ.get('COBBLER_CONTROLLERS', 3))
COBBLER_COMPUTES = int(os.environ.get('COBBLER_COMPUTES', 3))
COBBLER_SWIFTS = int(os.environ.get('COBBLER_SWIFTS', 0))
COBBLER_PROXIES = int(os.environ.get('COBBLER_PROXIES', 0))
COBBLER_QUANTUM = int(os.environ.get('COBBLER_QUANTUM', 0))
COBBLER_KEYSTONE = int(os.environ.get('COBBLER_KEYSTONE', 0))
EMPTY_SNAPSHOT = os.environ.get('EMPTY_SNAPSHOT', 'empty')
OPENSTACK_SNAPSHOT = os.environ.get('OPENSTACK_SNAPSHOT', 'openstack')