FIXUP fix prov

.configs/nginx/fabrica.conf

@@ -0,0 +1,5 @@
+location /fabrica/ {
+    alias %%ROOT%%/images/;
+    autoindex on;
+    allow all;
+}

.gitignore

@@ -2,3 +2,4 @@
 images/
 packer_cache/
 *inventory
+*~

.packer/provisioning/playbooks/eole/eole.yml

@@ -43,17 +43,17 @@
 
   - name: Adding EOLE main repository
     apt_repository:
-      repo: deb [arch=amd64] http://eole.ac-dijon.fr/eole eole-2.7.2 main cloud
+      repo: deb [arch=amd64] http://eole.ac-dijon.fr/eole eole-{{ EOLE_VERSION }} main cloud
       state: present
 
   - name: Adding EOLE security repository
     apt_repository:
-      repo: deb [arch=amd64] http://eole.ac-dijon.fr/eole eole-2.7.2-security main cloud
+      repo: deb [arch=amd64] http://eole.ac-dijon.fr/eole eole-{{ EOLE_VERSION }}-security main cloud
       state: present
 
   - name: Adding EOLE updates repository
     apt_repository:
-      repo: deb [arch=amd64] http://eole.ac-dijon.fr/eole eole-2.7.2-updates main cloud
+      repo: deb [arch=amd64] http://eole.ac-dijon.fr/eole eole-{{ EOLE_VERSION }}-updates main cloud
       state: present
 
   - name: Update cache
@@ -65,6 +65,16 @@
       http_proxy: "{{ http_proxy }}"
       https_proxy: "{{ https_proxy }}"
 
+  - name: Install chromium browser on 2.7.2
+    apt:
+      name: chromium-browser
+    environment:
+      HTTP_PROXY: "{{ http_proxy }}"
+      HTTPS_PROXY: "{{ https_proxy }}"
+      http_proxy: "{{ http_proxy }}"
+      https_proxy: "{{ https_proxy }}"
+    when: EOLE_VERSION == "2.7.2"
+
   - name: Install eole-server and eole-exim-pkg
     apt:
       name: eole-server,eole-exim-pkg

.packer/recipes/eole/2.7.2/eolebase.json

@@ -23,6 +23,7 @@
       "iso_checksum": "none",
       "disk_image": true,
       "format": "qcow2",
+      "vnc_bind_address": "0.0.0.0",
       "disk_size": "{{ user `image_size` }}",
       "ssh_username": "root",
       "ssh_password": "cadoles",
@@ -30,17 +31,13 @@
       "accelerator": "kvm",
       "net_device": "virtio-net",
       "disk_interface": "virtio",
-      "ssh_wait_timeout": "5m",
+      "ssh_wait_timeout": "45m",
       "boot_wait": "5s",
       "output_directory": "{{ user `output_dir` }}",
       "vm_name": "{{ user `image_name` }}.img",
       "headless": true,
-      "qemuargs": [
+      "cpus": "2",
-        [
+      "memory" : "4096"
-          "-m",
-          "2048"
-        ]
-      ]
     }
   ],
   "provisioners": [
@@ -67,12 +64,22 @@
     {
       "type": "ansible",
       "playbook_file": "{{user `eole_playbooks`}}/eole.yml", 
-      "extra_arguments": [ "-vvvv", "--extra-vars", "VM_NAME={{ user `vm_name` }} HTTP_PROXY={{ user `HTTP_PROXY` }} HTTPS_PROXY={{ user `HTTPS_PROXY` }} http_proxy={{ user `http_proxy` }} https_proxy={{ user `https_proxy` }}"]
+      "extra_arguments": [ 
+        "--extra-vars", 
+        "VM_NAME={{ user `vm_name` }} EOLE_VERSION={{ user `eole_version` }}",
+        "--extra-vars", 
+        "HTTP_PROXY={{ user `HTTP_PROXY` }} HTTPS_PROXY={{ user `HTTPS_PROXY` }} http_proxy={{ user `http_proxy` }} https_proxy={{ user `https_proxy` }}"
+      ]
     },
     {
       "type":"ansible",
       "playbook_file":"{{ user `eole_playbooks` }}/provision.yml",
-      "extra_arguments": [ "--extra-vars", "VM_NAME={{ user `vm_name` }} HTTP_PROXY={{ user `HTTP_PROXY` }} HTTPS_PROXY={{ user `HTTPS_PROXY` }} http_proxy={{ user `http_proxy` }} https_proxy={{ user `https_proxy` }}"]
+      "extra_arguments": [ 
+        "--extra-vars", 
+        "VM_NAME={{ user `vm_name` }} EOLE_VERSION={{ user `eole_version` }}",
+        "--extra-vars", 
+        "HTTP_PROXY={{ user `HTTP_PROXY` }} HTTPS_PROXY={{ user `HTTPS_PROXY` }} http_proxy={{ user `http_proxy` }} https_proxy={{ user `https_proxy` }}"
+      ]
     }
   ],
   "post-processors": [

.packer/recipes/ubuntu/18.04/packer.json

@@ -27,6 +27,7 @@
       "iso_urls": [ "{{ user `ubuntu_mirror` }}{{ user `ubuntu_codename` }}-updates/main/installer-amd64/current/images/netboot/mini.iso" ],
       "ssh_username": "{{ user `ssh_username` }}",
       "ssh_password": "{{ user `ssh_password` }}",
+      "vnc_bind_address": "0.0.0.0",
       "ssh_wait_timeout": "60m",
       "headless": "{{ user `headless` }}",
       "output_directory": "{{ template_dir }}/../../../images/ubuntu/18.04",

.packer/recipes/ubuntu/18.04/scripts/provision-minimal.sh

@@ -49,6 +49,8 @@ systemctl disable apt-daily
 systemctl disable apt-daily.timer
 systemctl disable apt-daily-upgrade
 
+apt-get install -y qemu-guest-agent
+
 # Cleanup
 rm -f "${ONE_CONTEXT_PACKAGE_DEST}"
 apt-get -y clean

.terraform/main.tf

@@ -22,7 +22,7 @@ provider "dns" {
 /*
  * Virtual networks
  */
-resource "opennebula_virtual_network" "vnet"{
+resource "opennebula_virtual_network" "vnets"{
   for_each = var.virtual_networks
   name = each.key
   vlan_id = each.value.vlan_id
@@ -60,7 +60,7 @@ module "vms" {
   vcpu = each.value.vcpu
   ram = each.value.memory
 
-  vnets = opennebula_virtual_network.vnet
+  vnets = opennebula_virtual_network.vnets
   network_interfaces = each.value.network_interfaces
 
   tag_labels = each.value.labels
@@ -72,7 +72,8 @@ module "vms" {
   data_image_source = ""
 
   depends = [ 
-    opennebula_virtual_network.vnet[each.value.depends[0]].id
+      for dp in each.value.network_interfaces:
+      opennebula_virtual_network.vnets[dp.network_name].id
   ]
 }