Merge "[Baremetal] - Change roles and playbooks names"

12 files changed, 15 insertions, 20 deletions

diff --git a/xci/playbooks/roles/create-vm-nodes/README.md b/xci/playbooks/roles/create-nodes/README.md
index d96a2981..bf079b9e 100644
--- a/xci/playbooks/roles/create-vm-nodes/README.md
+++ b/xci/playbooks/roles/create-nodes/README.md
@@ -1,14 +1,16 @@
-create-vm-nodes
+create-nodes
 ================
 
-This role creates the XCI VMs used to deploy scenarios. It is a branch from the
-bifrost role "bifrost-create-vm-nodes":
+This role creates the all nodes required for the XCI deployment. In a baremetal
+deployment, it creates the OPNFV VM and provisions the physical servers. In a
+non-baremetal deployment, it creates the OPNFV VM and the rest of VMs used to
+deploy scenarios. It is based on the bifrost role:
 
 https://github.com/openstack/bifrost/tree/master/playbooks/roles/bifrost-create-vm-nodes
 
-It creates the VMs based on the pdf and idf document which describes the
-characteristics of the VMs or physical servers. For more information check the
-spec:
+It creates the VMs or provisions the physical servers based on the pdf and idf
+document which describes the characteristics of the VMs or physical servers.
+For more information check the spec:
 
 https://github.com/opnfv/releng-xci/blob/master/docs/specs/infra_manager.rst
 
@@ -19,9 +21,9 @@ Flow
 The script xci/infra/bifrost/scripts/bifrost-provision.sh will call the
 playbook that starts executing the role:
 
-xci-create-vms.yaml
+xci-setup-nodes.yaml
 
-Note that at this stage the pdf and the opnfv_vm.yml are loaded.
+Note that at this stage the pdf and the opnfv_pdf_vm.yml are loaded.
 
 Some distro specific tasks related to variables are done and then the
 prepare_libvirt playbook is run. This playbook, as the name says,
@@ -32,7 +34,9 @@ the data and finally dump it all into the baremetal_json_file which will be
 read by bifrost in the subsequent role.
 
 The opnfv vm and the rest of vms get created using the xml libvirt template,
-which gets filled with the pdf and opnfv_vm.yml variables.
+which gets filled with the pdf and opnfv_pdf_vm.yml variables. If there is a
+baremetal deployment, the nodes_json_data gets filled in the
+baremetalhoststojson.yml playbook which basically reads the pdf info.
 
 Finally nodes_json_data is dumped.
 
@@ -49,18 +53,9 @@ The following packages are required and ensured to be present:
 Warning
 -------
 
-- It is currently assumed that the OS for the VM will be installed in the first
-disk of the node described by the pdf. That's why there is a [0] in:
-
-    - name: create volume for vm
-      command: >
-        virsh --connect {{ vm_libvirt_uri }}
-        vol-create-as {{ node_storage_pool }} {{ vm_name }}.qcow2
-        {{ item.disks[0].disk_capacity }}
-        --format qcow2 {{ prealloc|default("") }}
-
 - It is assumed that the opnfv VM characteristics are not described in the pdf
-but in a similar document called opnfv_vm.yml
+but in a similar document called opnfv_pdf_vm.yml. There is also an idf
+document opnfv_idf_vm.yml
 
 - All references to csv from bifrost-create-vm-nodes were removed
 
diff --git a/xci/playbooks/roles/create-vm-nodes/defaults/main.yml b/xci/playbooks/roles/create-nodes/defaults/main.yml
index 6ac266a5..6ac266a5 100644
--- a/xci/playbooks/roles/create-vm-nodes/defaults/main.yml
+++ b/xci/playbooks/roles/create-nodes/defaults/main.yml
diff --git a/xci/playbooks/roles/create-vm-nodes/tasks/create_vm.yml b/xci/playbooks/roles/create-nodes/tasks/create_vm.yml
index df019c88..df019c88 100644
--- a/xci/playbooks/roles/create-vm-nodes/tasks/create_vm.yml
+++ b/xci/playbooks/roles/create-nodes/tasks/create_vm.yml
diff --git a/xci/playbooks/roles/create-vm-nodes/tasks/download_opnfvimage.yml b/xci/playbooks/roles/create-nodes/tasks/download_opnfvimage.yml
index a227bc4f..a227bc4f 100644
--- a/xci/playbooks/roles/create-vm-nodes/tasks/download_opnfvimage.yml
+++ b/xci/playbooks/roles/create-nodes/tasks/download_opnfvimage.yml
diff --git a/xci/playbooks/roles/create-vm-nodes/tasks/main.yml b/xci/playbooks/roles/create-nodes/tasks/main.yml
index 64857d80..64857d80 100644
--- a/xci/playbooks/roles/create-vm-nodes/tasks/main.yml
+++ b/xci/playbooks/roles/create-nodes/tasks/main.yml
diff --git a/xci/playbooks/roles/create-vm-nodes/tasks/prepare_libvirt.yml b/xci/playbooks/roles/create-nodes/tasks/prepare_libvirt.yml
index 3f49e756..3f49e756 100644
--- a/xci/playbooks/roles/create-vm-nodes/tasks/prepare_libvirt.yml
+++ b/xci/playbooks/roles/create-nodes/tasks/prepare_libvirt.yml
diff --git a/xci/playbooks/roles/create-vm-nodes/templates/net.xml.j2 b/xci/playbooks/roles/create-nodes/templates/net.xml.j2
index 7e372ffe..7e372ffe 100644
--- a/xci/playbooks/roles/create-vm-nodes/templates/net.xml.j2
+++ b/xci/playbooks/roles/create-nodes/templates/net.xml.j2
diff --git a/xci/playbooks/roles/create-vm-nodes/templates/pool_dir.xml.j2 b/xci/playbooks/roles/create-nodes/templates/pool_dir.xml.j2
index e4645deb..e4645deb 100644
--- a/xci/playbooks/roles/create-vm-nodes/templates/pool_dir.xml.j2
+++ b/xci/playbooks/roles/create-nodes/templates/pool_dir.xml.j2
diff --git a/xci/playbooks/roles/create-vm-nodes/templates/vm.xml.j2 b/xci/playbooks/roles/create-nodes/templates/vm.xml.j2
index e4e41eda..e4e41eda 100644
--- a/xci/playbooks/roles/create-vm-nodes/templates/vm.xml.j2
+++ b/xci/playbooks/roles/create-nodes/templates/vm.xml.j2
diff --git a/xci/playbooks/roles/create-vm-nodes/vars/debian.yml b/xci/playbooks/roles/create-nodes/vars/debian.yml
index bcfc47d5..bcfc47d5 100644
--- a/xci/playbooks/roles/create-vm-nodes/vars/debian.yml
+++ b/xci/playbooks/roles/create-nodes/vars/debian.yml
diff --git a/xci/playbooks/roles/create-vm-nodes/vars/redhat.yml b/xci/playbooks/roles/create-nodes/vars/redhat.yml
index 2b285110..2b285110 100644
--- a/xci/playbooks/roles/create-vm-nodes/vars/redhat.yml
+++ b/xci/playbooks/roles/create-nodes/vars/redhat.yml
diff --git a/xci/playbooks/roles/create-vm-nodes/vars/suse.yml b/xci/playbooks/roles/create-nodes/vars/suse.yml
index 7e4c41ef..7e4c41ef 100644
--- a/xci/playbooks/roles/create-vm-nodes/vars/suse.yml
+++ b/xci/playbooks/roles/create-nodes/vars/suse.yml