diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-09-21 19:05:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-21 19:05:03 +0000 |
| commit | fbc49a7d84eefbecb2ef9774bae99d30e66a52be (patch) | |
| tree | d57f6937f754af2cd033b379765199a6d78ee904 /apex | |
| parent | 330a071566034447fa6a4de17e56be1cceb1c83b (diff) | |
| parent | 18b0862b97850f3e4bfb9abf0dc5835e90f0dada (diff) | |
Merge "Revert "Adds Calipso scenario""
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/deploy.py | 1 | ||||
| -rw-r--r-- | apex/settings/deploy_settings.py | 3 |
2 files changed, 1 insertions, 3 deletions
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'] |