Skip to content

Commit

Permalink
Closes-Bug: #1640464 - Kernel Upgrade flag not set in new params form…
Browse files Browse the repository at this point in the history
…at (SMLITE)

SMLITE testbed parser was generating the kernel upgrade flag in old format due to which it wasn't being read
Also added parameter for kernel_version at server level in case user wants to specify a version other than default used

Change-Id: Iadb09389435117fb71b7901ed7cfb1b1ac7c31c1
  • Loading branch information
nitishkrishna committed Nov 10, 2016
1 parent 55b2e5a commit bbf8a7a
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions src/client/testbed_parser.py
Expand Up @@ -657,18 +657,19 @@ def __init__(self, testsetup, **kwargs):
def _initialize(self, hostobj):
# set kernel upgrade 'yes' by default
kernel_upgrade_flag = self.testsetup.testbed.env.get('kernel_upgrade', True)
kernel_version = self.testsetup.testbed.env.get('kernel_version', None)
if kernel_upgrade_flag:
kernel_upgrade = 'yes'
kernel_upgrade = True
else:
kernel_upgrade = 'no'
kernel_upgrade = False
if not kernel_version:
kernel_version = ''
server_dict = {"id": hostobj.hostname,
"roles": hostobj.roles,
"cluster_id": self.cluster_id,
"password": hostobj.password,
"domain": hostobj.domain_name,
"parameters": {
"kernel_upgrade" : kernel_upgrade,
},
"parameters": {},
"network": {
"management_interface": hostobj.interface,
"provisioning": "kickstart",
Expand All @@ -683,6 +684,8 @@ def _initialize(self, hostobj):
}
server_dict['parameters']['provision'] = {}
server_dict['parameters']['provision']['contrail'] = {}
server_dict['parameters']['provision']['contrail']['kernel_upgrade'] = kernel_upgrade
server_dict['parameters']['provision']['contrail']['kernel_version'] = str(kernel_version)
server_dict['parameters']['provision']['contrail']['storage'] = {}
server_dict['parameters']['provision']['contrail']['compute'] = {}
static_route_list = []
Expand Down

0 comments on commit bbf8a7a

Please sign in to comment.