summaryrefslogtreecommitdiffstats
path: root/xci/infra/bifrost
diff options
context:
space:
mode:
authorManuel Buil <mbuil@suse.com>2018-10-04 15:30:59 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-10-04 15:30:59 +0000
commit637814daf8715d70e1ee9b120ec6f8ebea0be9b5 (patch)
tree84e2b2cb9d9ea20b9785440ab3430afc8738d4b1 /xci/infra/bifrost
parent342239db77b3e447ea91bd3d034248d080e6c335 (diff)
parentf54c78e2c36d7db53260bc868b5b538cb8e9d911 (diff)
Merge "[Baremetal] - Change roles and playbooks names"
Diffstat (limited to 'xci/infra/bifrost')
-rw-r--r--xci/infra/bifrost/infra-provision.sh4
-rw-r--r--xci/infra/bifrost/playbooks/xci-prepare-env.yml (renamed from xci/infra/bifrost/playbooks/xci-prepare-virtual.yml)0
-rw-r--r--xci/infra/bifrost/playbooks/xci-setup-nodes.yml (renamed from xci/infra/bifrost/playbooks/xci-create-virtual.yml)2
3 files changed, 3 insertions, 3 deletions
diff --git a/xci/infra/bifrost/infra-provision.sh b/xci/infra/bifrost/infra-provision.sh
index ad5b377b..0b25f258 100644
--- a/xci/infra/bifrost/infra-provision.sh
+++ b/xci/infra/bifrost/infra-provision.sh
@@ -32,14 +32,14 @@ ansible-playbook ${XCI_ANSIBLE_PARAMS} \
-e xci_distro=${XCI_DISTRO} \
-e pdf_file=${PDF} \
-e idf_file=${IDF} \
- ${BIFROST_ROOT_DIR}/playbooks/xci-create-virtual.yml
+ ${BIFROST_ROOT_DIR}/playbooks/xci-setup-nodes.yml
ansible-playbook ${XCI_ANSIBLE_PARAMS} \
--private-key=${XCI_PATH}/xci/scripts/vm/id_rsa_for_dib \
--user=devuser \
-i ${XCI_PATH}/xci/playbooks/dynamic_inventory.py \
- ${BIFROST_ROOT_DIR}/playbooks/xci-prepare-virtual.yml
+ ${BIFROST_ROOT_DIR}/playbooks/xci-prepare-env.yml
source ${XCI_CACHE}/repos/bifrost/scripts/bifrost-env.sh
diff --git a/xci/infra/bifrost/playbooks/xci-prepare-virtual.yml b/xci/infra/bifrost/playbooks/xci-prepare-env.yml
index b4ad8c0c..b4ad8c0c 100644
--- a/xci/infra/bifrost/playbooks/xci-prepare-virtual.yml
+++ b/xci/infra/bifrost/playbooks/xci-prepare-env.yml
diff --git a/xci/infra/bifrost/playbooks/xci-create-virtual.yml b/xci/infra/bifrost/playbooks/xci-setup-nodes.yml
index 381c4fd4..9c9c1016 100644
--- a/xci/infra/bifrost/playbooks/xci-create-virtual.yml
+++ b/xci/infra/bifrost/playbooks/xci-setup-nodes.yml
@@ -22,7 +22,7 @@
include_vars:
file: "{{ xci_path }}/xci/var/{{ ansible_os_family }}.yml"
roles:
- - role: create-vm-nodes
+ - role: create-nodes
become: yes
- role: clone-repository
project: "opnfv/bifrost"