p/fuel: Rebase after non-root deploys got upstream

While at it, refresh "AArch64 virtio NIC names sync" to include
changes for ODL-L3 scenario recently added in Fuel@OPNFV.

Change-Id: Ic221b330d9968204b7d4da16a26454b2cf8b88eb
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

1 files changed, 40 insertions, 0 deletions

diff --git a/patches/opnfv-fuel/0007-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch b/patches/opnfv-fuel/0007-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
new file mode 100644
index 00000000..267407cb
--- /dev/null
+++ b/patches/opnfv-fuel/0007-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
@@ -0,0 +1,40 @@
+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 %}