summaryrefslogtreecommitdiffstats
path: root/xci/playbooks
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2018-01-22 12:17:04 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-01-22 12:17:04 +0000
commite08ea41d577b9b29d6fdc1ec1892bdbaf5fff680 (patch)
tree8da0b5f14c7600e7d50fd6956ebfa8a37fdc6933 /xci/playbooks
parent862219cb61d57598029fc3dfe21923ccd00df257 (diff)
parentb12d656ce20490d1a7079d6c1ff3c34844edd568 (diff)
Merge "xci: get-opnfv-scenario-requirements.yml: Check if facts are set"
Diffstat (limited to 'xci/playbooks')
-rw-r--r--xci/playbooks/get-opnfv-scenario-requirements.yml7
1 files changed, 5 insertions, 2 deletions
diff --git a/xci/playbooks/get-opnfv-scenario-requirements.yml b/xci/playbooks/get-opnfv-scenario-requirements.yml
index 7eaa43de..c04348e3 100644
--- a/xci/playbooks/get-opnfv-scenario-requirements.yml
+++ b/xci/playbooks/get-opnfv-scenario-requirements.yml
@@ -114,11 +114,12 @@
- set_fact:
deploy_scenario_flavor: "{{ (XCI_FLAVOR in deploy_scenario_installer.flavors) | bool }}"
when:
+ - deploy_scenario_installer is defined
- deploy_scenario_installer
- set_fact:
deploy_scenario_distro: "{{ (XCI_DISTRO in deploy_scenario_installer.distros) | bool }}"
when:
- - deploy_scenario_installer
+ - deploy_scenario_flavor is defined
- deploy_scenario_flavor
when: deploy_scenario is defined
@@ -135,7 +136,9 @@
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- ''
when:
- - deploy_scenario is not defined or not deploy_scenario_distro
+ - deploy_scenario is not defined or
+ deploy_scenario_distro is not defined or
+ (deploy_scenario_distro is defined and not deploy_scenario_distro)
vars:
ansible_python_interpreter: "/usr/bin/python"