summaryrefslogtreecommitdiffstats
path: root/ci/genBundle.py
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-08-15 08:41:55 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-08-15 09:18:31 -0500
commitb4c1448a8548b75de14915110abc4a0be292482a (patch)
tree0dd882337ccbbb7ab72fe1f418eb49f4275ffa3a /ci/genBundle.py
parent86c767d5c762fc1555f54a7a9ec9029617c6950e (diff)
added option to choose the architecture of hyperconverged ot not.
Change-Id: If5d83b221ce1481014f2e76816a7fe568e656904 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/genBundle.py')
-rw-r--r--ci/genBundle.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/ci/genBundle.py b/ci/genBundle.py
index 9c6781b5..499cd63a 100644
--- a/ci/genBundle.py
+++ b/ci/genBundle.py
@@ -88,7 +88,10 @@ def to_select(qty=False):
if not qty:
qty = config['os']['ha']['cluster_size'] if \
config['os']['ha']['mode'] == 'ha' else 1
- return random.sample(range(0, config['opnfv']['units']), qty)
+ if config['os']['hyperconverged']:
+ return random.sample(range(0, config['opnfv']['units']), qty)
+ else:
+ return random.sample(range(0, qty), qty)
def get_password(key, length=16, special=False):
@@ -173,6 +176,8 @@ if 'bgpvpn' in features:
config['os']['network']['bgpvpn'] = True
if 'odll3' in features:
config['os']['network']['odll3'] = True
+if 'dishypcon' in features:
+ config['os']['hyperconverged'] = False
# Set beta option from extra
if 'publicapi' in extra:
@@ -185,6 +190,8 @@ if 'trusty' in extra:
config['ubuntu']['release'] = 'trusty'
if 'liberty' in extra:
config['os']['release'] = 'liberty'
+if 'dishypcon' in extra:
+ config['os']['hyperconverged'] = False
#
# Transform template to bundle.yaml according to config