From 18b0862b97850f3e4bfb9abf0dc5835e90f0dada Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Thu, 21 Sep 2017 15:35:55 +0000 Subject: Revert "Adds Calipso scenario" This reverts commit 433961f8c0b816f19aa858654261fa87d2f02a19. Change-Id: Ic8a14d2e0ad8d1006625af401fde2f365890650b Signed-off-by: Tim Rozet --- apex/deploy.py | 1 - apex/settings/deploy_settings.py | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'apex') diff --git a/apex/deploy.py b/apex/deploy.py index 28416eec..9ebc3f62 100644 --- a/apex/deploy.py +++ b/apex/deploy.py @@ -404,7 +404,6 @@ def main(): deploy_vars['congress'] = True else: deploy_vars['congress'] = False - deploy_vars['calipso'] = ds_opts.get('calipso', False) # 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 35c911bd..793e43ac 100644 --- a/apex/settings/deploy_settings.py +++ b/apex/settings/deploy_settings.py @@ -32,8 +32,7 @@ OPT_DEPLOY_SETTINGS = ['performance', 'dovetail', 'odl_vpp_routing_node', 'odl_vpp_netvirt', - 'barometer', - 'calipso'] + 'barometer'] VALID_ROLES = ['Controller', 'Compute', 'ObjectStorage'] VALID_PERF_OPTS = ['kernel', 'nova', 'vpp', 'ovs'] -- cgit 1.2.3-korg