x86_64: Revert base, VCP kernel to 4.4/4.8

Commit 7bfb0ac switched both base and VCP images to using Ubuntu
kernel hwe-16.04-edge (4.13.x). Due to testing suites compatibility
issues, switch back to:
- default Xenial kernel (4.4.x) for base image;
- hwe-16.04 (4.8.x) for VCP image (similar to Mirantis image);

Fixes: 7bfb0ac

Change-Id: I458c42124efa6eda765774fe05cab402d6111f82
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/mcp/config/scenario/defaults-x86_64.yaml b/mcp/config/scenario/defaults-x86_64.yaml
index 4db3aad..d916ffb 100644 (file)
--- a/mcp/config/scenario/defaults-x86_64.yaml
+++ b/mcp/config/scenario/defaults-x86_64.yaml
@@ -20,10 +20,9 @@ virtual:
         - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main
     pkg:
       install:
-        - linux-image-generic-hwe-16.04-edge
-        - linux-headers-generic-hwe-16.04-edge
         - salt-minion
   control:
     pkg:
       install:
-        - cloud-init
+        - linux-image-generic-hwe-16.04
+        - linux-headers-generic-hwe-16.04