From 2b4a81e86ed55f99ae8a7c00aab38809c8489903 Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Mon, 18 Dec 2017 17:28:12 +0400
Subject: [maas] Set edge hwe kernel as a default minimum

Change-Id: I360dcb675c90b6f20687979ebc493afe6682c821
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 8494ec245aa24f00f2412d0f9d1e1e32591708d7)
---
 .../cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml
index b2e22b3cb..6332776d8 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml
@@ -23,6 +23,7 @@ parameters:
     maas_db_password: opnfv_secret
     dns_server01: ${_param:opnfv_dns_server01}
     single_address: ${_param:infra_maas_node01_deploy_address}
+    hwe_kernel: 'hwe-16.04-edge'
   maas:
     region:
       salt_master_ip: ${_param:reclass_config_master}
@@ -36,7 +37,7 @@ parameters:
         dnssec_validation: 'no'
         enable_third_party_drivers: true
         network_discovery: 'enabled'
-        default_min_hwe_kernel: 'hwe-16.04'
+        default_min_hwe_kernel: ${_param:hwe_kernel}
       subnets:
         opnfv_maas_pxe:
           name: ${_param:opnfv_infra_maas_pxe_network_address}/24
@@ -62,7 +63,7 @@ parameters:
             power_user: ${_param:opnfv_maas_node01_power_user}
           architecture: ${_param:opnfv_maas_node01_architecture}
           distro_series: xenial
-          hwe_kernel: hwe-16.04
+          hwe_kernel: ${_param:hwe_kernel}
         kvm02:
           interface:
             mac: ${_param:opnfv_maas_node02_interface_mac}
@@ -73,7 +74,7 @@ parameters:
             power_user: ${_param:opnfv_maas_node02_power_user}
           architecture: ${_param:opnfv_maas_node02_architecture}
           distro_series: xenial
-          hwe_kernel: hwe-16.04
+          hwe_kernel: ${_param:hwe_kernel}
         kvm03:
           interface:
             mac: ${_param:opnfv_maas_node03_interface_mac}
@@ -84,7 +85,7 @@ parameters:
             power_user: ${_param:opnfv_maas_node03_power_user}
           architecture: ${_param:opnfv_maas_node03_architecture}
           distro_series: xenial
-          hwe_kernel: hwe-16.04
+          hwe_kernel: ${_param:hwe_kernel}
         cmp001:
           interface:
             mac: ${_param:opnfv_maas_node04_interface_mac}
@@ -95,7 +96,7 @@ parameters:
             power_user: ${_param:opnfv_maas_node04_power_user}
           architecture: ${_param:opnfv_maas_node04_architecture}
           distro_series: xenial
-          hwe_kernel: hwe-16.04
+          hwe_kernel: ${_param:hwe_kernel}
         cmp002:
           interface:
             mac: ${_param:opnfv_maas_node05_interface_mac}
@@ -106,7 +107,7 @@ parameters:
             power_user: ${_param:opnfv_maas_node05_power_user}
           architecture: ${_param:opnfv_maas_node05_architecture}
           distro_series: xenial
-          hwe_kernel: hwe-16.04
+          hwe_kernel: ${_param:hwe_kernel}
   linux:
     network:
       interface:
-- 
cgit 1.2.3-korg