From 9519a11e1fe0eb26cf5b776d8479065f2f710737 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 11 Sep 2017 20:17:20 +0200 Subject: u/fuel: Bump & rebase for multiarch reclass Change-Id: I3de41645b7424195b9c8d5884a7c9de1fabf68cb Signed-off-by: Alexandru Avadanii --- ...alt-formulas-opendaylight-AArch64-leveldb.patch | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch (limited to 'patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch') diff --git a/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch b/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch new file mode 100644 index 00000000..31308fd4 --- /dev/null +++ b/patches/opnfv-fuel/0003-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 +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 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 +--- + 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 8c6c3b2..a2236ae 100644 +--- a/mcp/salt-formulas/opendaylight/server.sls ++++ b/mcp/salt-formulas/opendaylight/server.sls +@@ -58,4 +58,9 @@ opendaylight: + - service: opendaylight + {%- endif %} + ++opendaylight_aarch64_leveldbjni: ++ pkg.installed: ++ {% if grains['cpuarch'] == 'aarch64'%} ++ - name: armband-odl-leveldb-fix ++ {% endif %} + {%- endif %} -- cgit 1.2.3-korg