diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-19 02:13:08 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-26 04:09:24 +0100 |
| commit | d8dd9847b7a534b3c78af1b3eb772f07a3543d0c (patch) | |
| tree | 762075694cdf249831e3b24d47dc9123c971733c /patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch | |
| parent | 812d2f0ef3b7f638a29f10770007ef249d609c2c (diff) | |
u/fuel: Bump & rebase for new deploy arg `-E`
Slight refactor of Armband high states, combine all parts touching
salt minion into a single `armband.salt_minion` state.
Also bring in support for NVRAM-backed domain undefine via
`virt.purge` by passing down the proper flag to libvirt.
While at it, squash mcp/patches touching the same lines of code
in <_modules/seedng.py>, so deploys using `-f` do not fail at the
patch stage (due to conflicting patch lines, checking for `patch -R`
does not work as expected).
Change-Id: Iefca061e641854d28bd8576f2b4547c87c239e32
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch')
| -rw-r--r-- | patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch b/patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch deleted file mode 100644 index 7aef2328..00000000 --- a/patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch +++ /dev/null @@ -1,36 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 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: Charalampos Kominos <charalampos.kominos@enea.com> -Date: Thu, 24 Aug 2017 19:28:14 +0200 -Subject: [PATCH] aarch64: skip configuration of hugepages - -The reclass model contains instructions on how to setup nova.conf. -Those instructions need to be overwritten for ARM. - -Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> -Signed-off-by: Charalampos Kominos <charalampos.kominos@enea.com> ---- - .../classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml -index a78850f..ce67588 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml -@@ -12,8 +12,8 @@ classes: - - system.linux.storage.loopback - - system.glusterfs.client.cluster - - system.nova.compute.cluster -- - system.nova.compute.nfv.hugepages -- - system.nova.compute.nfv.cpu_pinning -+ # - system.nova.compute.nfv.hugepages -+ # - system.nova.compute.nfv.cpu_pinning - - system.neutron.gateway.cluster - - system.cinder.volume.single - - system.cinder.volume.backend.lvm |