From 514b35f8b74ce07133eec2ab3a4dd8060216f639 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Mon, 19 Feb 2018 12:09:15 +1100 Subject: [PATCH] Allow multiple declarations of ARM64 of HWE kernel package The openafs puppet module also declares a linux-generic-hwe-16.04 package for arm64 as it is required for those modules. This is to cover the non-afs server case, where the later kernel still works better anyway. Switch to ensure_packages, which handles if it is already declared, so everyone can live together in peace. Change-Id: I72c9423956b7739695a04a5de27f5d89c67240d0 --- modules/openstack_project/manifests/server.pp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp index 6301cd803d..3e2213d9ef 100644 --- a/modules/openstack_project/manifests/server.pp +++ b/modules/openstack_project/manifests/server.pp @@ -344,9 +344,7 @@ class openstack_project::server ( if ($::lsbdistcodename == 'xenial' and $::architecture == 'aarch64') { # Make sure we install the HWE kernel for arm64; it's 4.13 v 4.3 # and works much better on linaro cloud - package { 'linux-generic-hwe-16.04': - ensure => present, - } + ensure_packages(['linux-generic-hwe-16.04']) } }