blob: af8e35ef593e026abaaf15d535756acbd18b0c53 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
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 %}
|
