[baremetal] Switch VCP base image to UCA

Since Mirantis prebuilt image comes with salt-minion 2016.3 instead
of 2016.11 and upgrading it leads to a hard to break catch-22, use
the Ubuntu cloud archive image we already download for FN VMs and
pre-install:
- a newer kernel (hwe-edge);
- salt-minion (2016.11);
This also implicitly aligns the image handling on AArch64 and x86_64.

Change-Id: I86d1c777449d37bdd0348936a598e3ffe9d265af
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 4dfff71..4db3aad 100644 (file)
--- a/mcp/config/scenario/defaults-x86_64.yaml
+++ b/mcp/config/scenario/defaults-x86_64.yaml
@@ -11,3 +11,19 @@ virtual:
   default:
     vcpus: 2
     ram: 4096
+  common:
+    apt:
+      keys:
+        - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/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/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

diff --git a/mcp/patches/0009-seedng-module-Sync-salt-version.patch b/mcp/patches/0009-seedng-module-Sync-salt-version.patch
deleted file mode 100644 (file)
index d116c81..0000000
--- a/mcp/patches/0009-seedng-module-Sync-salt-version.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Mon, 21 Aug 2017 02:03:01 +0200
-Subject: [PATCH] seedng: module: Sync salt version
-
-salt custom py module seedng.py should use the same Salt version
-when preinstalling minion for salt-controlled VMs via bootstrap
-script.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
-
-diff --git a/_modules/seedng.py b/_modules/seedng.py
---- a/_modules/seedng.py
-+++ b/_modules/seedng.py
-@@ -256,8 +256,10 @@
-     boot_, tmppath = (prep_bootstrap(mpt)
-              or salt.syspaths.BOOTSTRAP)
-     # Exec the chroot command
-+    arg = 'stable {0}'.format('.'.join(salt.version.__version__.split('.')[:2]))
-     cmd = 'if type salt-minion; then exit 0; '
--    cmd += 'else sh {0} -c /tmp; fi'.format(os.path.join(tmppath, 'bootstrap-salt.sh'))
-+    cmd += 'else sh {0} -c /tmp {1}; fi'.format(
-+        os.path.join(tmppath, 'bootstrap-salt.sh'), arg)
-     return not __salt__['cmd.run_chroot'](mpt, cmd, python_shell=True)['retcode']
-
-

diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
index 2f9d6bb..284f1bc 100644 (file)
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -14,6 +14,5 @@
 /usr/share/salt-formulas/env: 0007-network.interface-Fix-ifup-OVS-port-with-route.patch
 /usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch
 /usr/share/salt-formulas/env: 0009-controller-Use-keystoneclient-to-check-project-ID.patch
-/usr/share/salt-formulas/env: 0009-seedng-module-Sync-salt-version.patch
 /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
 /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch

diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/x86_64/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/x86_64/init.yml
index a9a774b..1554a32 100644 (file)
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/x86_64/init.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/x86_64/init.yml
@@ -8,7 +8,7 @@
 ---
 parameters:
   _param:
-    salt_control_xenial_image: http://images.mirantis.com.s3.amazonaws.com/ubuntu-16-04-x64-latest.qcow2
+    salt_control_xenial_image: salt://salt/files/control/images/base_image_opnfv_fuel_vcp.img
 
     # VMs spawned on Foundation Node / Jump Host net ifaces (max 4)
     opnfv_fn_vm_primary_interface: ens3

diff --git a/mcp/scripts/requirements_deb.yaml b/mcp/scripts/requirements_deb.yaml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/mcp/scripts/requirements_rpm.yaml b/mcp/scripts/requirements_rpm.yaml
old mode 100755 (executable)
new mode 100644 (file)