Skip to content

Commit

Permalink
From R3.0 socket files are moved to /var/run from /tmp
Browse files Browse the repository at this point in the history
Hence for upgrade to releases  3.0 or greater edit correct path in toragent
init script .

Change-Id: If255df7ee9c8e747c9878ee630fdb4ddfd0fa25a
Closes-Bug: #1666218
  • Loading branch information
krharsh committed Mar 3, 2017
1 parent 7b1f4b3 commit 5ed6732
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions contrail_provisioning/compute/upgrade.py
Expand Up @@ -4,6 +4,7 @@
#
"""Upgrade's Contrail Compute components."""

import os
from distutils.version import LooseVersion

from setup import ComputeSetup
Expand Down Expand Up @@ -83,6 +84,11 @@ def fix_nova_params(self):
nova_conf_file)
local("service %s start" % openstack_compute_service)

def fix_tor_agent_init_script(self):
for tor_file in os.listdir('/etc/init.d/'):
if 'contrail-tor-agent' in tor_file:
local("cp /etc/init.d/contrail-vrouter-agent /etc/init.d/%s " % (tor_file))

def upgrade(self):
self.disable_apt_get_auto_start()
self._upgrade()
Expand All @@ -97,6 +103,9 @@ def upgrade(self):
if (self._args.from_rel < LooseVersion('2.20') and
self._args.to_rel >= LooseVersion('2.20')):
self.compute_setup.fixup_contrail_vrouter_nodemgr()
if 'toragent' in self._args.roles:
if (self._args.to_rel >= LooseVersion('3.00')):
self.fix_tor_agent_init_script()
self.enable_apt_get_auto_start()

def main():
Expand Down

0 comments on commit 5ed6732

Please sign in to comment.