From daf7edb8192fb560a4806002e35f3e68734c392a Mon Sep 17 00:00:00 2001 From: Ranjeet R Date: Fri, 5 Jun 2015 16:49:28 -0700 Subject: [PATCH] Fixes: Fab Install fails in the case of non-dpdk openstack scenario Indentation of a previous commit pushed a line of code under another if block. Fixing the indentation issue. Change-Id: I0de35bc9a69d8c04c00e18bfba6b844fe1575baf ClosesBug:1462556 --- fabfile/utils/install.py | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/fabfile/utils/install.py b/fabfile/utils/install.py index 8ac174450..0922ece53 100644 --- a/fabfile/utils/install.py +++ b/fabfile/utils/install.py @@ -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']: @@ -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 @@ -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():