diff options
| -rw-r--r-- | xci/playbooks/get-opnfv-scenario-requirements.yml | 7 | ||||
| -rwxr-xr-x | xci/xci-deploy.sh | 7 |
2 files changed, 5 insertions, 9 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" diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh index ec2598f8..c1f14b75 100755 --- a/xci/xci-deploy.sh +++ b/xci/xci-deploy.sh @@ -121,13 +121,6 @@ case ${XCI_DISTRO,,} in ;; esac -if [[ ${XCI_DISTRO,,} == centos ]]; then - echo "" - echo "Warning: Only Ubuntu and SUSE hosts are fully supported for now!" - echo "Warning: CentOS 7 support is still work in progress." - echo -fi - # Clone OPNFV scenario repositories #------------------------------------------------------------------------------- # This playbook |