summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0011-seedng-module-Add-AArch64-repo.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-26 18:22:06 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-26 18:32:50 +0200
commit62d2ed716e79f9ee75d63543249bb21b9115b032 (patch)
tree1858f8f17f308a94ab6fbdce65858eb314aee01d /patches/opnfv-fuel/0011-seedng-module-Add-AArch64-repo.patch
parent6dcb09998dae3c3f2a55fc5169fe7dc9010f8a0f (diff)
u/fuel: Bump & rebase for full PDF support
Change-Id: I7ae833b429c018345d0ab061877d27e3183b3dc7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0011-seedng-module-Add-AArch64-repo.patch')
-rw-r--r--patches/opnfv-fuel/0011-seedng-module-Add-AArch64-repo.patch59
1 files changed, 59 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0011-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0011-seedng-module-Add-AArch64-repo.patch
new file mode 100644
index 00000000..4f6474a1
--- /dev/null
+++ b/patches/opnfv-fuel/0011-seedng-module-Add-AArch64-repo.patch
@@ -0,0 +1,59 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: 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: Mon, 21 Aug 2017 20:42:00 +0200
+Subject: [PATCH] seedng: module: Add AArch64 repo
+
+salt custom py module seedng.py should use custom repo arg
+"-R linux.enea.com/saltstack" on AArch64 nodes.
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ .../0105-seedng-module-Add-AArch64-repo.patch | 22 ++++++++++++++++++++++
+ mcp/patches/patches.list | 1 +
+ 2 files changed, 23 insertions(+)
+ create mode 100644 mcp/patches/0105-seedng-module-Add-AArch64-repo.patch
+
+diff --git a/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch b/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch
+new file mode 100644
+index 0000000..d40e63b
+--- /dev/null
++++ b/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch
+@@ -0,0 +1,22 @@
++From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
++Date: Mon, 21 Aug 2017 02:03:01 +0200
++Subject: [PATCH] seedng: module: Add AArch64 repo
++
++salt custom py module seedng.py should use custom repo arg
++"-R linux.enea.com/saltstack" on AArch64 nodes.
++
++Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
++---
++
++diff --git a/_modules/seedng.py b/_modules/seedng.py
++--- a/_modules/seedng.py
+++++ b/_modules/seedng.py
++@@ -257,6 +257,7 @@
++ or salt.syspaths.BOOTSTRAP)
++ # Exec the chroot command
++- arg = 'stable {0}'.format('.'.join(salt.version.__version__.split('.')[:2]))
+++ arg = '-R linux.enea.com/saltstack ' if os.uname()[-1] == 'aarch64' else ''
+++ arg += 'stable {0}'.format('.'.join(salt.version.__version__.split('.')[:2]))
++ cmd = 'if type salt-minion; then exit 0; '
++ cmd += 'else sh {0} -c /tmp {1}; fi'.format(
++ os.path.join(tmppath, 'bootstrap-salt.sh'), arg)
+diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
+index 2211c14..a6dfb6b 100644
+--- a/mcp/patches/patches.list
++++ b/mcp/patches/patches.list
+@@ -12,3 +12,4 @@
+ /usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch
+ /usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch
+ /usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch
++/usr/share/salt-formulas/env: 0105-seedng-module-Add-AArch64-repo.patch