From 0cf5b3770e33ed1168e98d557a6dc212ca57f970 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Thu, 21 Jul 2016 23:00:21 -0400 Subject: Adds configuring vpp/hc on all nodes Changes include: - starting vpp with pci addr of tenant nic - setting performance options for fdio scenario - creates nosdn fdio scenario (needs newtorking-vpp, etc) - starts HC if ODL is used opnfv-tht-pr: 46 JIRA: APEX-133 Change-Id: Ie7a7f1418b94dfb82255ec9aebc550a955dd696a Signed-off-by: Tim Rozet --- lib/python/apex/common/constants.py | 4 ++++ lib/python/apex/network_environment.py | 15 ++++++++++++++- lib/python/apex_python_utils.py | 15 ++++++++++++++- 3 files changed, 32 insertions(+), 2 deletions(-) (limited to 'lib/python') diff --git a/lib/python/apex/common/constants.py b/lib/python/apex/common/constants.py index 996ef2f0..ae8ffe31 100644 --- a/lib/python/apex/common/constants.py +++ b/lib/python/apex/common/constants.py @@ -17,3 +17,7 @@ OPNFV_NETWORK_TYPES = [ADMIN_NETWORK, PRIVATE_NETWORK, PUBLIC_NETWORK, DNS_SERVERS = ["8.8.8.8", "8.8.4.4"] ROLES = ['compute', 'controller'] DOMAIN_NAME = 'localdomain.com' +COMPUTE_PRE = "OS::TripleO::ComputeExtraConfigPre" +CONTROLLER_PRE = "OS::TripleO::ControllerExtraConfigPre" +PRE_CONFIG_DIR = "/usr/share/openstack-tripleo-heat-templates/puppet/" \ + "extraconfig/pre_deploy/" diff --git a/lib/python/apex/network_environment.py b/lib/python/apex/network_environment.py index 981c8f1c..bf81b98d 100644 --- a/lib/python/apex/network_environment.py +++ b/lib/python/apex/network_environment.py @@ -15,6 +15,9 @@ from .common.constants import ( STORAGE_NETWORK, PUBLIC_NETWORK, API_NETWORK, + CONTROLLER_PRE, + COMPUTE_PRE, + PRE_CONFIG_DIR ) PORTS = '/ports' @@ -48,8 +51,11 @@ class NetworkEnvironment: The class builds upon an existing network-environment file and modifies based on a NetworkSettings object. """ - def __init__(self, net_settings, filename): + def __init__(self, net_settings, filename, compute_pre_config=False, + controller_pre_config=False): with open(filename, 'r') as net_env_fh: + self.compute_pre = compute_pre_config + self.controller_pre = controller_pre_config self.netenv_obj = yaml.load(net_env_fh) self._update_net_environment(net_settings) @@ -185,6 +191,13 @@ class NetworkEnvironment: prefix = '' self.netenv_obj[reg][key] = tht_dir + prefix + postfix + if self.compute_pre: + self.netenv_obj[reg][COMPUTE_PRE] = PRE_CONFIG_DIR + \ + "compute/numa.yaml" + if self.controller_pre: + self.netenv_obj[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. diff --git a/lib/python/apex_python_utils.py b/lib/python/apex_python_utils.py index bc9bc56f..c548437d 100755 --- a/lib/python/apex_python_utils.py +++ b/lib/python/apex_python_utils.py @@ -38,7 +38,9 @@ def parse_net_settings(args): """ settings = NetworkSettings(args.net_settings_file, args.network_isolation) - net_env = NetworkEnvironment(settings, args.net_env_file) + net_env = NetworkEnvironment(settings, args.net_env_file, + args.compute_pre_config, + args.controller_pre_config) dump_yaml(net_env.get_netenv_settings(), '/tmp/network-environment.yaml') settings.dump_bash() @@ -136,6 +138,17 @@ def get_parser(): default="network-environment.yaml", dest='net_env_file', help='path to network environment file') + net_settings.add_argument('--compute-pre-config', + default=False, + action='store_true', + dest='compute_pre_config', + help='Boolean to enable Compute Pre Config') + net_settings.add_argument('--controller-pre-config', + action='store_true', + default=False, + dest='controller_pre_config', + help='Boolean to enable Controller Pre Config') + net_settings.set_defaults(func=parse_net_settings) get_int_ip = subparsers.add_parser('find-ip', -- cgit 1.2.3-korg