From c5c9e23e0df08e46862b4c2a8deff825b76a9f13 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 4 Oct 2017 17:38:39 +0200 Subject: u/fuel: Bump for second neutron formula fixup Change-Id: I52cb9720a452c4fa7b71a9135de700f5c601132d Signed-off-by: Alexandru Avadanii (cherry picked from commit 90b9c3793db3b70ddb705924a7e823fd2ae9bb92) --- .../0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch | 4 ++-- patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch | 4 ++-- .../opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch | 4 ++-- patches/opnfv-fuel/0011-seedng-module-Add-AArch64-repo.patch | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'patches/opnfv-fuel') diff --git a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch index 1a81bbfd..4aebeaff 100644 --- a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch +++ b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch @@ -102,10 +102,10 @@ index 0000000..b969e07 ++{{endif}} ++{% endraw %} diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 4140adb..0607ef9 100644 +index e20a341..b2a6325 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -8,3 +8,4 @@ +@@ -7,3 +7,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: 0010-maas-region-allow-timeout-override.patch diff --git a/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch b/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch index 1a6b2f98..a758659d 100644 --- a/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch +++ b/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch @@ -48,10 +48,10 @@ 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 0607ef9..4d75677 100644 +index b2a6325..4dc47c7 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -9,3 +9,4 @@ +@@ -8,3 +8,4 @@ /usr/share/salt-formulas/env: 0009-seedng-module-Sync-salt-version.patch /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch diff --git a/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch index 8e4b97b8..c7b7428c 100644 --- a/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch @@ -150,10 +150,10 @@ index 0000000..a9fe11b + + #salt_control_seed_{{ cluster_name }}_{{ node_name }}: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 4d75677..2211c14 100644 +index 4dc47c7..f6312b6 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -10,3 +10,5 @@ +@@ -9,3 +9,5 @@ /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.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/0011-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0011-seedng-module-Add-AArch64-repo.patch index 4f6474a1..c684b434 100644 --- a/patches/opnfv-fuel/0011-seedng-module-Add-AArch64-repo.patch +++ b/patches/opnfv-fuel/0011-seedng-module-Add-AArch64-repo.patch @@ -49,10 +49,10 @@ index 0000000..d40e63b + 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 +index f6312b6..17baeaa 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -12,3 +12,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 -- cgit 1.2.3-korg