summaryrefslogtreecommitdiffstats
path: root/lib/python/apex
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-02-08 13:42:42 -0500
committerFeng Pan <fpan@redhat.com>2017-02-18 01:38:25 +0000
commitc7e6d15b4d2570c7f9d2bc8dcfc57d8a68fede71 (patch)
tree81dcdb87979d37fa4bf061e92db79d88dd7c6f82 /lib/python/apex
parent89f0410672d80015c419f77e69a5bb155cac2bfe (diff)
Add support for odl-fdio scenario
Changes: - Kernel parameters are now set through first-boot.yaml during deployment. No custom images will be built. Note that all nodes will be configured the same way, we only use compute's kernel parameter settings currently (from deploy settings file) - Add support for VPP interface type in network settings file, it is now possible to specify vpp_interface type and uio_driver for tenant nic in network settings file. A new example config, network_settings_vpp.yaml is added. - Add support for odl_l2-fdio scenario. Limitations: - Physical NIC names must be specified in network settings file, numbered nic names such as nic1 are not supported for fdio scenarios. - The same kernel parameters will be configured for all nodes. The paramters will be taken from compute kernel parameter section in deploy settings file. opnfv-tht-pr: 104 opnfv-puppet-tripleo-pr: 12 os-net-config-pr: 3 Change-Id: Ie9d6151e6e58d11da3c66fbcabe4a0886c3fa152 Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'lib/python/apex')
-rw-r--r--lib/python/apex/network_environment.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/python/apex/network_environment.py b/lib/python/apex/network_environment.py
index 4fc6f583..dbe89b21 100644
--- a/lib/python/apex/network_environment.py
+++ b/lib/python/apex/network_environment.py
@@ -172,11 +172,6 @@ class NetworkEnvironment(dict):
# apply resource registry update for API_RESOURCES
self._config_resource_reg(API_RESOURCES, postfix)
- if compute_pre_config:
- self[reg][COMPUTE_PRE] = PRE_CONFIG_DIR + "compute/numa.yaml"
- if controller_pre_config:
- self[reg][CONTROLLER_PRE] = PRE_CONFIG_DIR + "controller/numa.yaml"
-
# Set IPv6 related flags to True. Not that we do not set those to False
# when IPv4 is configured, we'll use the default or whatever the user
# may have set.