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: Ifa8125a0fb9a95f5713902faf8dc908305533cad
Closes-Bug: #1666218
  • Loading branch information
krharsh committed Mar 3, 2017
1 parent d9a1cbd commit 635fb73
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 @@ -87,6 +88,11 @@ def fix_nova_config_kv3_params(self):
local("openstack-config --set /etc/nova/nova.conf neutron project_domain_name Default")
local("openstack-config --set /etc/nova/nova.conf neutron user_domain_name Default")

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 @@ -106,6 +112,9 @@ def upgrade(self):
if ('v3' in self._args.keystone_version and
self._args.from_rel <= LooseVersion('3.1.2.0')):
self.fix_nova_config_kv3_params()
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 635fb73

Please sign in to comment.