Skip to content

Commit

Permalink
Update the correct file for grub configuration (ubuntu 16.04)
Browse files Browse the repository at this point in the history
Change-Id: Ic1513d718042b30dba3415f57cc86947728adcd3
partial-bug: #1694216
  • Loading branch information
haripk committed May 31, 2017
1 parent 034b428 commit a025a82
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
3 changes: 1 addition & 2 deletions src/vnsw/provisioning/contrail_vrouter_provisioning/base.py
Expand Up @@ -73,15 +73,14 @@ def replace_in_file(self, file, regexp, replace):
def setup_crashkernel_params(self):
kcmd = r"sudo sed -i 's/crashkernel=.*\([ | \"]\)"
kcmd += r"/crashkernel=384M-2G:64M,2G-16G:128M,16G-:256M\1/g' "
kcmd += "/etc/default/grub.d/kexec-tools.cfg"
if self.pdistversion == '14.04':
kcmd += "/etc/default/grub.d/kexec-tools.cfg"
local(kcmd, warn_only=True)
cmd = "[ -f /etc/default/kdump-tools ] && "
cmd += "sudo sed -i 's/USE_KDUMP=0/USE_KDUMP=1/' "
cmd += "/etc/default/kdump-tools"
local(cmd, warn_only=True)
else:
kcmd += "/etc/grub.d/10_linux"
local(kcmd)
local("sudo update-grub")

Expand Down
6 changes: 0 additions & 6 deletions src/vnsw/provisioning/contrail_vrouter_provisioning/common.py
Expand Up @@ -62,12 +62,6 @@ def __init__(self, args):
# Deduce physical interface of vhost0 from ip, if vhost0 exist.
self.physical_dev = self.get_physical_dev_of_vhost(self.vhost_ip)

def enable_kernel_core(self):
self.enable_kernel_core()
if self.pdist not in ['Ubuntu']:
for svc in ['abrt-vmcore', 'abrtd', 'kdump']:
local('sudo chkconfig %s on' % svc)

def fixup_config_files(self):
self.add_dev_tun_in_cgroup_device_acl()
self.fixup_contrail_vrouter_agent()
Expand Down

0 comments on commit a025a82

Please sign in to comment.