From 17c64de8f2d9c86c0f80df8dddf7831210f5234a Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Thu, 21 Sep 2017 19:06:46 +0000 Subject: Adds Calipso scenario Change-Id: Icc8a23e49c9ccc011481f6b97599d4f75873ebb1 Signed-off-by: Tim Rozet (cherry picked from commit 1a824cf106f1996f184a7f699c754a7b72c501be) --- apex/deploy.py | 3 +++ apex/settings/deploy_settings.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'apex') diff --git a/apex/deploy.py b/apex/deploy.py index 8a3d13ed..5ec0f7fa 100644 --- a/apex/deploy.py +++ b/apex/deploy.py @@ -409,6 +409,9 @@ def main(): deploy_vars['congress'] = True else: deploy_vars['congress'] = False + deploy_vars['calipso'] = ds_opts.get('calipso', False) + deploy_vars['calipso_ip'] = net_settings['networks']['admin'][ + 'installer_vm']['ip'] # TODO(trozet): this is probably redundant with getting external # network info from undercloud.py if 'external' in net_settings.enabled_network_list: diff --git a/apex/settings/deploy_settings.py b/apex/settings/deploy_settings.py index 164997ec..c0594056 100644 --- a/apex/settings/deploy_settings.py +++ b/apex/settings/deploy_settings.py @@ -33,7 +33,8 @@ OPT_DEPLOY_SETTINGS = ['performance', 'odl_vpp_routing_node', 'dvr', 'odl_vpp_netvirt', - 'barometer'] + 'barometer', + 'calipso'] VALID_ROLES = ['Controller', 'Compute', 'ObjectStorage'] VALID_PERF_OPTS = ['kernel', 'nova', 'vpp', 'ovs'] -- cgit 1.2.3-korg