diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-23 15:38:06 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-23 15:39:40 +0200 |
| commit | 93f8d97757dfe37d262a95148ac94f7a2c78a64e (patch) | |
| tree | a4393db9b1f34b11be4ece05f7164bdd9ecba8f8 /patches/opnfv-fuel/0018-seedng-module-Add-AArch64-repo.patch | |
| parent | 2cc327653a8a294346e6d47b0c94e9486414608a (diff) | |
p/fuel: Rebase after authorized_keys fix upstream
Change-Id: Id53c2513b52d05a44dffda0fda40f8df259e226b
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0018-seedng-module-Add-AArch64-repo.patch')
| -rw-r--r-- | patches/opnfv-fuel/0018-seedng-module-Add-AArch64-repo.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/patches/opnfv-fuel/0018-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0018-seedng-module-Add-AArch64-repo.patch deleted file mode 100644 index 330d416a..00000000 --- a/patches/opnfv-fuel/0018-seedng-module-Add-AArch64-repo.patch +++ /dev/null @@ -1,54 +0,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 | 25 ++++++++++++++++++++++ - mcp/patches/patches.list | 1 + - 2 files changed, 26 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..e191421 ---- /dev/null -+++ b/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch -@@ -0,0 +1,25 @@ -+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 -+@@ -256,8 +256,10 @@ -+ boot_, tmppath = (prep_bootstrap(mpt) -+ or salt.syspaths.BOOTSTRAP) -+ # Exec the chroot command -++ cmdR = '-R linux.enea.com/saltstack' if os.uname()[-1] == 'aarch64' else '' -+ cmd = 'if type salt-minion; then exit 0; ' -+- cmd += 'else sh {0} -c /tmp; fi'.format(os.path.join(tmppath, 'bootstrap-salt.sh')) -++ cmd += 'else sh {0} {1} -c /tmp; fi'.format( -++ os.path.join(tmppath, 'bootstrap-salt.sh'), cmdR) -+ return not __salt__['cmd.run_chroot'](mpt, cmd, python_shell=True)['retcode'] -+ -+ -diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 67b9c82..b4b2b30 100644 ---- a/mcp/patches/patches.list -+++ b/mcp/patches/patches.list -@@ -9,3 +9,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 |