diff options
| author |   Dan Radez <dradez@redhat.com> | 2017-09-21 13:40:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-21 13:40:46 +0000 |
| commit | 330a071566034447fa6a4de17e56be1cceb1c83b (patch) | |
| tree | 41ec76c929359ac41d3f9343c6116f9c5552f4e1 /apex | |
| parent | 3755bd651deed84291de61cd56530ad856e3d1b1 (diff) | |
| parent | 433961f8c0b816f19aa858654261fa87d2f02a19 (diff) | |
Merge "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, 3 insertions, 1 deletions
diff --git a/apex/deploy.py b/apex/deploy.py index 9ebc3f62..28416eec 100644 --- a/apex/deploy.py +++ b/apex/deploy.py @@ -404,6 +404,7 @@ 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 793e43ac..35c911bd 100644 --- a/apex/settings/deploy_settings.py +++ b/apex/settings/deploy_settings.py @@ -32,7 +32,8 @@ OPT_DEPLOY_SETTINGS = ['performance', 'dovetail', 'odl_vpp_routing_node', 'odl_vpp_netvirt', - 'barometer'] + 'barometer', + 'calipso'] VALID_ROLES = ['Controller', 'Compute', 'ObjectStorage'] VALID_PERF_OPTS = ['kernel', 'nova', 'vpp', 'ovs'] |