summaryrefslogtreecommitdiffstats
path: root/apex
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-08-30 22:00:15 -0400
committerTim Rozet <trozet@redhat.com>2017-09-20 17:12:10 -0400
commit433961f8c0b816f19aa858654261fa87d2f02a19 (patch)
treed37b4923b92fe98e6fcd540a87f24b1e3485b6b1 /apex
parent946251720965cd5da9f6798d3ff931950524dd24 (diff)
Adds Calipso scenario
Calipso uses docker containers and is post deployment feature that can be used to monitor pieces of the stack. This patch installs it to the undercloud rather than the jumphost as it is easier to manage for cleanup and dependencies. Change-Id: Ie2dacc4f14b391a864fafb2e75ebcd15facb19f1 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'apex')
-rw-r--r--apex/deploy.py1
-rw-r--r--apex/settings/deploy_settings.py3
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']