diff options
3 files changed, 68 insertions, 17 deletions
diff --git a/patches/opnfv-fuel/0000-patches-seedng-module-Sync-salt-version.patch b/patches/opnfv-fuel/0000-patches-seedng-module-Sync-salt-version.patch new file mode 100644 index 00000000..b3042fd1 --- /dev/null +++ b/patches/opnfv-fuel/0000-patches-seedng-module-Sync-salt-version.patch @@ -0,0 +1,55 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Tue, 29 Aug 2017 00:50:56 +0200 +Subject: [PATCH] patches: seedng: module: Sync salt version + +JIRA: FUEL-282 + +Change-Id: I6c86ce0b1113ca674b1756e7997559eee90a4e5f +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + .../0009-seedng-module-Sync-salt-version.patch | 26 ++++++++++++++++++++++ + mcp/patches/patches.list | 1 + + 2 files changed, 27 insertions(+) + create mode 100644 mcp/patches/0009-seedng-module-Sync-salt-version.patch + +diff --git a/mcp/patches/0009-seedng-module-Sync-salt-version.patch b/mcp/patches/0009-seedng-module-Sync-salt-version.patch +new file mode 100644 +index 0000000..cfab883 +--- /dev/null ++++ b/mcp/patches/0009-seedng-module-Sync-salt-version.patch +@@ -0,0 +1,26 @@ ++From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ++Date: Mon, 21 Aug 2017 02:03:01 +0200 ++Subject: [PATCH] seedng: module: Sync salt version ++ ++salt custom py module seedng.py should use the same Salt version ++when preinstalling minion for salt-controlled VMs via bootstrap ++script. ++ ++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 +++ arg = 'stable {0}'.format('.'.join(salt.version.__version__.split('.')[:2])) ++ 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'), arg) ++ 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 419ff26..f65daab 100644 +--- a/mcp/patches/patches.list ++++ b/mcp/patches/patches.list +@@ -6,3 +6,4 @@ + /usr/share/salt-formulas/env: 0006-maas-module-Add-VLAN-DHCP-enable-support.patch + /usr/share/salt-formulas/env: 0007-linux.network.interface-noifupdown-support.patch + /usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch ++/usr/share/salt-formulas/env: 0009-seedng-module-Sync-salt-version.patch diff --git a/patches/opnfv-fuel/0009-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0009-maas-Add-curtin_userdata_arm64_generic_xenial.patch index 985dd65d..2d701937 100644 --- a/patches/opnfv-fuel/0009-maas-Add-curtin_userdata_arm64_generic_xenial.patch +++ b/patches/opnfv-fuel/0009-maas-Add-curtin_userdata_arm64_generic_xenial.patch @@ -94,11 +94,11 @@ index 0000000..b969e07 ++{{endif}} ++{% endraw %} diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 419ff26..dbc72db 100644 +index f65daab..ed2dd4e 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -6,3 +6,4 @@ - /usr/share/salt-formulas/env: 0006-maas-module-Add-VLAN-DHCP-enable-support.patch +@@ -7,3 +7,4 @@ /usr/share/salt-formulas/env: 0007-linux.network.interface-noifupdown-support.patch /usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch + /usr/share/salt-formulas/env: 0009-seedng-module-Sync-salt-version.patch +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch diff --git a/patches/opnfv-fuel/0017-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0017-seedng-module-Add-AArch64-repo.patch index 49f69e93..918a4d86 100644 --- a/patches/opnfv-fuel/0017-seedng-module-Add-AArch64-repo.patch +++ b/patches/opnfv-fuel/0017-seedng-module-Add-AArch64-repo.patch @@ -7,17 +7,17 @@ salt custom py module seedng.py should use custom repo arg 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(+) + .../0105-seedng-module-Add-AArch64-repo.patch | 21 +++++++++++++++++++++ + mcp/patches/patches.list | 1 + + 2 files changed, 22 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 +index 0000000..1cb80bc --- /dev/null +++ b/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch -@@ -0,0 +1,25 @@ +@@ -0,0 +1,21 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Mon, 21 Aug 2017 02:03:01 +0200 +Subject: [PATCH] seedng: module: Add AArch64 repo @@ -31,18 +31,14 @@ index 0000000..e191421 +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) ++@@ -257,6 +257,7 @@ + or salt.syspaths.BOOTSTRAP) + # Exec the chroot command -++ cmdR = '-R linux.enea.com/saltstack' if os.uname()[-1] == 'aarch64' else '' ++ arg = 'stable {0}'.format('.'.join(salt.version.__version__.split('.')[:2])) +++ arg +=' -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'] -+ -+ ++ cmd += 'else sh {0} {1} -c /tmp; fi'.format( ++ os.path.join(tmppath, 'bootstrap-salt.sh'), arg) diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list index 2eed8f3..1d86e35 100644 --- a/mcp/patches/patches.list |