aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-26 05:43:39 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-26 22:26:00 +0100
commit37083673d6cdddbb9b710f4dd5efe832753e5856 (patch)
treea0ef84e1ab70b5f1aca9254c3664847c056ab474 /patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
parentd8dd9847b7a534b3c78af1b3eb772f07a3543d0c (diff)
u/fuel: Bump & rebase for image pre-install
1. Bump to latest Fuel@OPNFV to include: - Bring in newer glusterfs for mtime unsplit brain * Requires adding arch "arm64" to PPA definition in reclass: - (reclass-system) linux.system.repo.glusterfs: Add arm64 arch - Switch nofeature-ha compute nodes to UCA repo * Requires an alternative way of adding linux.enea.com repos; * linux.enea.com repos will now be pre-install into VM images; * Requires refresh on repo arch list handled by Armband patch: - (fuel) baremetal, virtual: Extend arch list for UCA repo 2. Staging proposed patches from upstream Fuel@OPNFV: - Add pre-{install,purge} support for base image * Reference implementation adds pre-installed Armband specifics: - Enea public GPG to APT keys (for below repos); - repos (linux.enea.com/{apt-mk,mcp-repos}/*); - linux-{image,headers}-generic-hwe-16.04-edge; - cloud-init: datasource from NoCloud only; * Allows us to drop kernel installation from state files, installing the kernel only once during image prep, instead of two stages of parallel installs (5 baremetal, 14 VCP); * Ensures Armband repos are pre-configured for infrastructure VMs, allowing us to drop more reclass repo definitions; * Rework armband patch to install kernel only on kvm, cmp: - (fuel) baremetal: linux-image-generic-hwe-16.04-edge 3. Sync reclass repo definitions with upstream change, drop duplicates - [linux][repos] Remove unused repositories [1] * Upstream dropped all "ocata-{security,hotfix,...} repo comps, which are also empty for Armband, so drop them too; * Rework following armband patches: - (reclass-system) linux/system/repo/mcp: Add Armband repos * Move Armband repos to new dedicated reclass classes: - linux.system.repo.mcp.armband.extra (currently empty); - linux.system.repo.mcp.armband.openstack; * Use HTTPS for fetching Enea Armband GPG key; - (fuel) baremetal: Add Armband Openstack repos to kvm, cmp * Consume defs introduced above only on baremetal nodes; 4. Sync documentation with Fuel@OPNFV (cp) 5. Add vim swap files to .gitignore [1] https://github.com/Mirantis/reclass-system-salt-model/commit/1dd1b31 Change-Id: Ibab56279de86f08ad7cd9bc6761f4c525532f811 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch')
-rw-r--r--patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch b/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
new file mode 100644
index 00000000..af8e35ef
--- /dev/null
+++ b/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
@@ -0,0 +1,48 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: 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: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Thu, 27 Jul 2017 23:42:29 +0200
+Subject: [PATCH] mcp: salt-formulas: opendaylight: AArch64 leveldb
+
+ODL requires native leveldbjni support on architectures like AArch64.
+Armband provides a Debian package that provides exactly that,
+specially tailored to be applied on top of upstream Opendaylight
+Debian package.
+
+Install <armband-odl-leveldb-fix> as part of the existing Opendaylight
+salt-formula (and not as part of Armband's separate salt-formula, like
+previous fixups).
+
+Some dependencies are not self-contained in this formula yet, and
+should be handled before upstreaming this patch:
+- Armband DEB repository (mcp-repos) is added by "openstack" state;
+- only Debian systems are supported (no equivalent RPM provided);
+- only systemd is supported (unlikely to change);
+
+JIRA: https://jira.opnfv.org/browse/ARMBAND-283
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ mcp/salt-formulas/opendaylight/server.sls | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls
+index 5de4eee..4bf81a9 100644
+--- a/mcp/salt-formulas/opendaylight/server.sls
++++ b/mcp/salt-formulas/opendaylight/server.sls
+@@ -72,4 +72,9 @@ opendaylight:
+ - service: opendaylight
+ {%- endif %}
+
++opendaylight_aarch64_leveldbjni:
++ pkg.installed:
++ {% if grains['cpuarch'] == 'aarch64'%}
++ - name: armband-odl-leveldb-fix
++ {% endif %}
+ {%- endif %}