diff options
author | 2017-09-04 18:48:04 +0200 | |
---|---|---|
committer | 2017-09-04 18:49:06 +0200 | |
commit | 993fd182dc10552d38a0f1ecab9d341f29685483 (patch) | |
tree | b7d813e1a2d177188125c76c5498c4ea35784ef0 /patches/opnfv-fuel/0005-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch | |
parent | 93beeac737a5b283fc3ae20d31226ea64bee232b (diff) |
u/fuel: Bump & rebase for cinder support
Change-Id: Ie116967d0dd909f1901e2099485795316a706ad7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0005-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch')
-rw-r--r-- | patches/opnfv-fuel/0005-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0005-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch b/patches/opnfv-fuel/0005-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch new file mode 100644 index 00000000..31308fd4 --- /dev/null +++ b/patches/opnfv-fuel/0005-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 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 %} |