Skip to content

Commit

Permalink
Fixes: Fab Install fails in the case of non-dpdk openstack scenario
Browse files Browse the repository at this point in the history
Indentation of a previous commit pushed a line of code under
another if block. Fixing the indentation issue.

Change-Id: I0de35bc9a69d8c04c00e18bfba6b844fe1575baf
ClosesBug:1462556
  • Loading branch information
Ranjeet R committed Jun 5, 2015
1 parent bce0e1b commit daf7edb
Showing 1 changed file with 2 additions and 17 deletions.
19 changes: 2 additions & 17 deletions fabfile/utils/install.py
Expand Up @@ -41,11 +41,6 @@ def get_compute_pkgs(manage_nova_compute='yes'):
compute node.
"""
ostype = detect_ostype()
#if get_orchestrator() is 'vcenter':
# pkgs = ['contrail-vmware-vrouter']
#else:
# pkgs = ['contrail-openstack-vrouter']

pkgs = ['contrail-openstack-vrouter']

if ostype in ['ubuntu']:
Expand All @@ -56,15 +51,11 @@ def get_compute_pkgs(manage_nova_compute='yes'):

if env.host_string in getattr(env, 'dpdk', []):
contrail_vrouter_pkg = 'contrail-vrouter-dpdk-init'

# This order of installation matters, because in a node with
# non recommended kernel installed, contrail-vrouter-dkms pkg
# needs to get installed first before contrail-openstack-vrouter.
#if get_orchestrator() is 'vcenter':
# pkgs = [contrail_vrouter_pkg, 'contrail-vmware-vrouter']
#else:
# pkgs = [contrail_vrouter_pkg, 'contrail-openstack-vrouter']

pkgs = [contrail_vrouter_pkg, 'contrail-openstack-vrouter']
pkgs = [contrail_vrouter_pkg, 'contrail-openstack-vrouter']

# Append only vrouter and contrail vrouter dependent packages
# no need to append the contrail-openstack-vrouter, which when
Expand Down Expand Up @@ -97,12 +88,6 @@ def get_compute_pkgs(manage_nova_compute='yes'):

def get_config_pkgs():
pkgs = ['contrail-openstack-config']

#if get_orchestrator() is 'vcenter':
# pkgs = ['contrail-vmware-config']
#else:
# pkgs = ['contrail-openstack-config']

return pkgs

def get_openstack_ceilometer_pkgs():
Expand Down

0 comments on commit daf7edb

Please sign in to comment.