[Baremetal] Include a baremetal variable

It switches between parts of the code which are specific for baremetal
or non-baremetal. Those parts come with this patch:

https://gerrit.opnfv.org/gerrit/#/c/60797

It also selects different variables when calling the opnfv-virtual.yml
playbook:

https://gerrit.opnfv.org/gerrit/#/c/60795

It decides the value of BAREMETAL based on the vendor value of the pdf

Change-Id: I8e6171f4f21db7f814a472e6ed1bacb30220b4ec
Signed-off-by: Manuel Buil <mbuil@suse.com>

diff --git a/xci/files/xci-lib.sh b/xci/files/xci-lib.sh
index 2f360e4..cb0751d 100644 (file)
--- a/xci/files/xci-lib.sh
+++ b/xci/files/xci-lib.sh
@@ -52,6 +52,8 @@ function bootstrap_xci_env() {
     source "$XCI_PATH/xci/installer/${INSTALLER_TYPE}/env" &>/dev/null || true
     # source xci configuration
     source $XCI_PATH/xci/config/env-vars
+    # source the baremetal variable
+    grep -o vendor.* ${PDF} | grep -q libvirt && export BAREMETAL=false || export BAREMETAL=true
 }
 
 function install_ansible() {

diff --git a/xci/var/opnfv.yml b/xci/var/opnfv.yml
index e7e3b76..b24a6d9 100644 (file)
--- a/xci/var/opnfv.yml
+++ b/xci/var/opnfv.yml
@@ -49,3 +49,6 @@ run_tempest: "{{ lookup('env', 'RUN_TEMPEST') }}"
 core_openstack_install: "{{ lookup('env', 'CORE_OPENSTACK_INSTALL') }}"
 deploy_scenario: "{{ lookup('env','DEPLOY_SCENARIO') }}"
 installer_type: "{{ lookup('env','INSTALLER_TYPE') }}"
+
+# baremetal variables
+baremetal: "{{ lookup('env','BAREMETAL') }}"