From 248b456255f831b27e458e2cd8bd0f449be11434 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Fri, 28 Jun 2019 15:52:22 +0200
Subject: [virtual] Add Ubuntu 18.04 (Bionic) basic support

Support Ubuntu 18.04 for virtual deployments (and implicitly for VCP
VMs). Note that MaaS-provisioned systems will require the same
changes being applied via curtin templates.

Change-Id: I7cbd7e7c4421f6b970ce6ef97c10d269fec5fca3
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 mcp/config/scenario/defaults.yaml.j2 | 40 ++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

(limited to 'mcp/config/scenario')

diff --git a/mcp/config/scenario/defaults.yaml.j2 b/mcp/config/scenario/defaults.yaml.j2
index 5a9b4fd80..8864974ec 100644
--- a/mcp/config/scenario/defaults.yaml.j2
+++ b/mcp/config/scenario/defaults.yaml.j2
@@ -22,6 +22,26 @@ x86_64:
         - virtual_control_plane
 {%- endif %}
 {%- endif %}
+  ubuntu1804:
+    base_image: https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img
+    common:
+      repo:
+        keys:
+          - https://repo.saltstack.com/apt/ubuntu/18.04/amd64/2017.7/SALTSTACK-GPG-KEY.pub
+        repos:
+          # <repo name> <repo prio> deb [arch=<arch>] <repo url> <repo dist> <repo comp>
+          - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/18.04/amd64/2017.7 bionic main
+      pkg:
+        install:
+          - salt-minion
+          - ifupdown
+          - cloud-init
+          - dnsmasq
+    control:
+      repo: ~
+      pkg:
+        install:
+          - cloud-init
   ubuntu1604:
     base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
     common:
@@ -64,6 +84,26 @@ aarch64:
     vcpus: 6
     ram: 4096
     cluster: *arch_default_cluster_states
+  ubuntu1804:
+    base_image: https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-arm64.img
+    common:
+      repo:
+        keys:
+          - https://repo.saltstack.com/apt/ubuntu/18.04/amd64/2017.7/SALTSTACK-GPG-KEY.pub
+        repos:
+          # <repo name> <repo prio> deb [arch=<arch>] <repo url> <repo dist> <repo comp>
+          - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/18.04/amd64/2017.7 bionic main
+      pkg:
+        install:
+          - salt-minion
+          - ifupdown
+          - cloud-init
+          - dnsmasq
+    control:
+      repo: ~
+      pkg:
+        install:
+          - cloud-init
   ubuntu1604:
     base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img
     common:
-- 
cgit 1.2.3-korg