summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Buil <mbuil@suse.com>2018-09-21 11:55:13 +0200
committerManuel Buil <mbuil@suse.com>2018-09-21 15:17:07 +0200
commit013bfffe38ab9a6c86a4a6e3bc2d08a5b5aedcbd (patch)
tree23e0b040b2c3eb9e6c33d86228ca075a3b0eae53
parent89ddab889df092ac9ed43834af534b9f5dea6b9d (diff)
Add idf and pdf to the xci-create-virtual.yml
This patch complements this other: https://gerrit.opnfv.org/gerrit/#/c/62575/2 We require the pdf and the idf (when doing baremetal) in the create-vm role, so we should propagate that variable to the playbook that triggers those roles Change-Id: I15806d386db4e6b11192829f2dbc61662bffec2b Signed-off-by: Manuel Buil <mbuil@suse.com>
-rw-r--r--xci/infra/bifrost/infra-provision.sh2
-rw-r--r--xci/infra/bifrost/playbooks/xci-create-virtual.yml3
2 files changed, 4 insertions, 1 deletions
diff --git a/xci/infra/bifrost/infra-provision.sh b/xci/infra/bifrost/infra-provision.sh
index 17eb4158..ad5b377b 100644
--- a/xci/infra/bifrost/infra-provision.sh
+++ b/xci/infra/bifrost/infra-provision.sh
@@ -30,6 +30,8 @@ ansible-playbook ${XCI_ANSIBLE_PARAMS} \
-e vm_domain_type=${VM_DOMAIN_TYPE} \
-e baremetal_json_file=/tmp/baremetal.json \
-e xci_distro=${XCI_DISTRO} \
+ -e pdf_file=${PDF} \
+ -e idf_file=${IDF} \
${BIFROST_ROOT_DIR}/playbooks/xci-create-virtual.yml
diff --git a/xci/infra/bifrost/playbooks/xci-create-virtual.yml b/xci/infra/bifrost/playbooks/xci-create-virtual.yml
index 043907fe..bc40d108 100644
--- a/xci/infra/bifrost/playbooks/xci-create-virtual.yml
+++ b/xci/infra/bifrost/playbooks/xci-create-virtual.yml
@@ -12,7 +12,8 @@
name: "Bootstrap XCI hardware resources and prepare provisioning environment"
gather_facts: yes
vars_files:
- - "{{ xci_path }}/xci/var/pdf.yml"
+ - "{{ pdf_file }}"
+ - "{{ idf_file }}"
- "{{ xci_path }}/xci/var/opnfv_vm.yml"
- "{{ xci_path }}/xci/var/opnfv.yml"
pre_tasks: