diff options
| author |   Feng Pan <fpan@redhat.com> | 2017-09-30 15:08:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-30 15:08:38 +0000 |
| commit | e6a9d7cebc9f6083a72863102138ab76a75ae3c9 (patch) | |
| tree | 4cecf04bd26126a88238c28295b8cb9e6e0318cc /apex | |
| parent | 8a8cb8e901db314fa59ed5275040b9e49b36663c (diff) | |
| parent | 1a824cf106f1996f184a7f699c754a7b72c501be (diff) | |
Merge "Adds Calipso scenario"
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/deploy.py | 3 | ||||
| -rw-r--r-- | apex/settings/deploy_settings.py | 3 |
2 files changed, 5 insertions, 1 deletions
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'] |