aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-28 18:41:09 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-05 23:14:01 +0100
commit0e8a4fc5a553bb55c22590c0620ebfd770394e96 (patch)
tree58fdd861d2efbe06bf2749aadcf31a60ccdfbe39 /patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
parent11f5bc3ca9191039b9b22e2da8a6e29538d2f6ea (diff)
MaaS: preseed Armband repo via curtin
Instead of installing upstream vanilla kernel from Ubuntu just to upgrade to the one from Armband repo later, preseed Armband repo config via curtin. This allows us to drop a kernel update cycle, thus saving a few minutes at each deploy. While at it, switch salt repo addition to use the maas region reclass section instead of adding a dedicated mechanism for it in the curtin template (only for arm64). [ stable/ euphrates ] Preseed all Armband repos, since Ocata does not have a "common" repo. JIRA: ARMBAND-280 Change-Id: Iad5953a7de80d728f11a4ce3113bd7725100c31c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 648ec98613d31e3d9701b9ac1d87aed640b245f3)
Diffstat (limited to 'patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch')
-rw-r--r--patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch48
1 files changed, 48 insertions, 0 deletions
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..af8e35ef
--- /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 <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 %}