From 6856c63376f87004377f94f534389da02dc9be16 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Fri, 20 Oct 2017 15:08:49 -0400 Subject: Make introspection optional - exposes new option to end users to skip introspection - moves the logic to decide to introspect or not into python JIRA: APEX-536 Change-Id: Ieaff11362ff8f906daa98d301d3d473ad549d08f Signed-off-by: Dan Radez --- apex/deploy.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'apex') diff --git a/apex/deploy.py b/apex/deploy.py index 5485d150..d2f1c936 100644 --- a/apex/deploy.py +++ b/apex/deploy.py @@ -248,7 +248,11 @@ def main(): os_version=os_version) net_env_target = os.path.join(APEX_TEMP_DIR, constants.NET_ENV_FILE) utils.dump_yaml(dict(net_env), net_env_target) + + # get global deploy params ha_enabled = deploy_settings['global_params']['ha_enabled'] + introspect = deploy_settings['global_params'].get('introspect', True) + if args.virtual: if args.virt_compute_ram is None: compute_ram = args.virt_default_ram @@ -434,6 +438,9 @@ def main(): deploy_vars['virtual'] = args.virtual deploy_vars['debug'] = args.debug deploy_vars['aarch64'] = platform.machine() == 'aarch64' + deploy_vars['introspect'] = not (args.virtual or + deploy_vars['aarch64'] or + not introspect) deploy_vars['dns_server_args'] = '' deploy_vars['apex_temp_dir'] = APEX_TEMP_DIR deploy_vars['apex_env_file'] = os.path.basename(opnfv_env) -- cgit 1.2.3-korg