patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch

   1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   2 : Copyright (c) 2018 Enea AB and others.
   3 :
   4 : All rights reserved. This program and the accompanying materials
   5 : are made available under the terms of the Apache License, Version 2.0
   6 : which accompanies this distribution, and is available at
   7 : http://www.apache.org/licenses/LICENSE-2.0
   8 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   9 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  10 Date: Mon, 21 Aug 2017 20:42:00 +0200
  11 Subject: [PATCH] seedng: module: Add AArch64 repo
  12
  13 salt custom py module seedng.py should use custom repo arg
  14 "-R linux.enea.com/saltstack" on AArch64 nodes.
  15
  16 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  17 ---
  18  .../0105-seedng-module-Add-AArch64-repo.patch      | 22 ++++++++++++++++++++++
  19  mcp/patches/patches.list                           |  1 +
  20  2 files changed, 23 insertions(+)
  21  create mode 100644 mcp/patches/0105-seedng-module-Add-AArch64-repo.patch
  22
  23 diff --git a/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch b/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch
  24 new file mode 100644
  25 index 00000000..d40e63b2
  26 --- /dev/null
  27 +++ b/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch
  28 @@ -0,0 +1,22 @@
  29 +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  30 +Date: Mon, 21 Aug 2017 02:03:01 +0200
  31 +Subject: [PATCH] seedng: module: Add AArch64 repo
  32 +
  33 +salt custom py module seedng.py should use custom repo arg
  34 +"-R linux.enea.com/saltstack" on AArch64 nodes.
  35 +
  36 +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  37 +---
  38 +
  39 +diff --git a/_modules/seedng.py b/_modules/seedng.py
  40 +--- a/_modules/seedng.py
  41 ++++ b/_modules/seedng.py
  42 +@@ -257,6 +257,7 @@
  43 +              or salt.syspaths.BOOTSTRAP)
  44 +     # Exec the chroot command
  45 +-    arg = 'stable {0}'.format('.'.join(salt.version.__version__.split('.')[:2]))
  46 ++    arg = '-R linux.enea.com/saltstack ' if os.uname()[-1] == 'aarch64' else ''
  47 ++    arg += 'stable {0}'.format('.'.join(salt.version.__version__.split('.')[:2]))
  48 +     cmd = 'if type salt-minion; then exit 0; '
  49 +     cmd += 'else sh {0} -c /tmp {1}; fi'.format(
  50 +         os.path.join(tmppath, 'bootstrap-salt.sh'), arg)
  51 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
  52 index 520a2756..f7d25d3b 100644
  53 --- a/mcp/patches/patches.list
  54 +++ b/mcp/patches/patches.list
  55 @@ -19,3 +19,4 @@
  56  /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
  57  /usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch
  58  /usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch
  59 +/usr/share/salt-formulas/env: 0105-seedng-module-Add-AArch64-repo.patch