From 87dbc61c3460c981515e4ae1ca18ab54e069d790 Mon Sep 17 00:00:00 2001 From: Edgar Magana Date: Wed, 16 Nov 2011 14:52:40 -0800 Subject: [PATCH] The relative path for the "ucs_inventory.ini" file has been fixed Change-Id: I38053df8b398e3fadcc6820c1118b3685ccd4174 --- .../lib/quantum/plugins/cisco/ucs/cisco_ucs_inventory.py | 6 +++--- .../plugins/cisco/ucs/cisco_ucs_inventory_configuration.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/cisco-plugin/lib/quantum/plugins/cisco/ucs/cisco_ucs_inventory.py b/plugins/cisco-plugin/lib/quantum/plugins/cisco/ucs/cisco_ucs_inventory.py index d3edc4623..7e78fb26a 100644 --- a/plugins/cisco-plugin/lib/quantum/plugins/cisco/ucs/cisco_ucs_inventory.py +++ b/plugins/cisco-plugin/lib/quantum/plugins/cisco/ucs/cisco_ucs_inventory.py @@ -98,8 +98,8 @@ class UCSInventory(L2NetworkDeviceInventoryBase): def _load_inventory(self): """Load the inventory from a config file""" inventory = deepcopy(conf.INVENTORY) - #LOG.info("Loaded UCS inventory: %s\n" % inventory) - #LOG.info("Building UCS inventory state (this may take a while)...") + LOG.info("Loaded UCS inventory: %s\n" % inventory) + LOG.info("Building UCS inventory state (this may take a while)...") for ucsm in inventory.keys(): ucsm_ip = inventory[ucsm][const.IP_ADDRESS] @@ -142,7 +142,7 @@ class UCSInventory(L2NetworkDeviceInventoryBase): ucsm_password) blades_dict[blade_id] = blade_data - #LOG.debug("UCS Inventory state is: %s\n" % self._inventory_state) + LOG.debug("UCS Inventory state is: %s\n" % self._inventory_state) return True def _get_host_name(self, ucsm_ip, chassis_id, blade_id): diff --git a/plugins/cisco-plugin/lib/quantum/plugins/cisco/ucs/cisco_ucs_inventory_configuration.py b/plugins/cisco-plugin/lib/quantum/plugins/cisco/ucs/cisco_ucs_inventory_configuration.py index 721ee11f5..515efe1f4 100644 --- a/plugins/cisco-plugin/lib/quantum/plugins/cisco/ucs/cisco_ucs_inventory_configuration.py +++ b/plugins/cisco-plugin/lib/quantum/plugins/cisco/ucs/cisco_ucs_inventory_configuration.py @@ -23,7 +23,7 @@ import os from quantum.common.config import find_config_file from quantum.plugins.cisco.common import cisco_configparser as confp -CP = confp.CiscoConfigParser(find_config_file({}, [], - 'plugins/cisco/ucs_inventory.ini')) +CONF_FILE = find_config_file({}, None, "ucs_inventory.ini") +CP = confp.CiscoConfigParser(CONF_FILE) INVENTORY = CP.walk(CP.dummy) -- 2.45.2