Skip to content

Commit

Permalink
Closes-Bug: #1612459
Browse files Browse the repository at this point in the history
If kickstart file is given in the json, SM will point to the valid
ubuntu trusty kickstart file

Change-Id: I360948bb8a1441428f38d92191f5dad6b4758090
  • Loading branch information
sgurumurthy committed Nov 23, 2016
1 parent 0ae9c3a commit 7b8f1d1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/server_mgr_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -2734,13 +2734,13 @@ def _add_image_to_cobbler(self, image_id, image_type,
initrd_file = (
"/install/netboot/ubuntu-installer/amd64/initrd.gz")
if not ks_file:
ubuntu_ks_file = 'kickstarts/contrail-ubuntu.ks'
ubuntu_ks_file = 'kickstarts/contrail-ubuntu_trusty.ks'
kickstart = self._args.html_root_dir + ubuntu_ks_file
else:
ubuntu_ks_file = 'contrail/images/' + ks_file.split('/').pop()
if not kseed_file:
ks_file = self._args.html_root_dir + \
"kickstarts/contrail-ubuntu.seed"
"kickstarts/contrail-ubuntu_trusty.seed"
kickseed = ks_file
else:
ks_file = kseed_file
Expand Down

0 comments on commit 7b8f1d1

Please sign in to comment.