p/fuel: Rebase after seedng salt virt fix upstream

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

4 files changed, 13 insertions, 65 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
deleted file mode 100644
index b3042fd1..00000000
--- a/patches/opnfv-fuel/0000-patches-seedng-module-Sync-salt-version.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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/0013-libvirt-Use-libvirt-unix_sock_group.patch b/patches/opnfv-fuel/0013-libvirt-Use-libvirt-unix_sock_group.patch
index 833d5e7c..885035cc 100644
--- a/patches/opnfv-fuel/0013-libvirt-Use-libvirt-unix_sock_group.patch
+++ b/patches/opnfv-fuel/0013-libvirt-Use-libvirt-unix_sock_group.patch
@@ -40,9 +40,11 @@ index 0000000..003b249
 + # Set the UNIX socket permissions for the R/O socket. This is used
 + # for monitoring VM status only
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index dbc72db..b064772 100644
+index ed2dd4e..46a9556 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -7,1 +7,2 @@
+@@ -8,3 +8,4 @@
+ /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
 +/usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch
diff --git a/patches/opnfv-fuel/0015-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0015-virtng.py-virt.sls-Extend-libvirt_domain.patch
index 86a361a4..6c1ce16d 100644
--- a/patches/opnfv-fuel/0015-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0015-virtng.py-virt.sls-Extend-libvirt_domain.patch
@@ -142,10 +142,11 @@ index 0000000..a9fe11b
 +
 + #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index b064772..2eed8f3 100644
+index 46a9556..f6504ab 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -8,2 +8,4 @@
+@@ -9,3 +9,5 @@
+ /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
  /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
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 a5819fa1..ea245e95 100644
--- a/patches/opnfv-fuel/0017-seedng-module-Add-AArch64-repo.patch
+++ b/patches/opnfv-fuel/0017-seedng-module-Add-AArch64-repo.patch
@@ -7,14 +7,14 @@ 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       | 21 +++++++++++++++++++++
- mcp/patches/patches.list                            |  1 +
- 2 files changed, 22 insertions(+)
+ .../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..1cb80bc
+index 0000000..67c1ea1
 --- /dev/null
 +++ b/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch
 @@ -0,0 +1,22 @@
@@ -41,10 +41,10 @@ index 0000000..1cb80bc
 +     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
+index f6504ab..1faa164 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -10,3 +10,4 @@
+@@ -11,3 +11,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