From 67d2ec64a4dd0b265cc92ae0ee0562e88cb9539e Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 13 Dec 2017 20:34:37 +0100 Subject: u/fuel: Bump & rebase for libvirtd group fix JIRA: ARMBAND-335 Change-Id: Id42d3719dff18ef6948c1c2c18b48c8ac2b2d195 Signed-off-by: Alexandru Avadanii --- .../0002-salt-formulas-Add-enable-armband-formula.patch | 8 ++++---- .../0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch | 6 +++--- .../0008-virtng.py-virt.sls-Extend-libvirt_domain.patch | 6 +++--- patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch | 4 ++-- upstream/fuel | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch index 68c03080..94d3c7af 100644 --- a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch @@ -68,13 +68,13 @@ index 1578dcf..6dc27cd 100755 + +salt -I 'nova:compute' state.sls armband || true diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index d92e992..1cfcacd 100755 +index 3856bef..8c02d68 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -29,6 +29,7 @@ fi +@@ -27,6 +27,7 @@ if [ "${ERASE_ENV}" -eq 1 ]; then + fi + # KVM libvirt first, VCP deployment - #FIXME Should be removed once upstream patch get merged - salt -C 'kvm*' group.add libvirtd +salt -C 'kvm*' state.sls armband || true wait_for 5 "salt -C 'kvm*' state.sls libvirt" 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 3881ef91..5ef28b0f 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 @@ -64,13 +64,13 @@ index 0000000..0368937 + file.managed: + - source: salt://maas/files/pgpass diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index fcbd3ae..c303a96 100644 +index 00b1145..5dc2241 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -16,3 +16,4 @@ - /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch +@@ -17,3 +17,4 @@ /usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch + /usr/share/salt-formulas/env: 0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml index 93db0ed..bffab44 100644 diff --git a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch index 4976c1df..394dffc5 100644 --- a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch @@ -150,12 +150,12 @@ index 0000000..a9fe11b + + #salt_control_seed_{{ cluster_name }}_{{ node_name }}: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index c303a96..940ee4d 100644 +index 5dc2241..2342b8f 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -17,3 +17,5 @@ - /usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch +@@ -18,3 +18,5 @@ /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch + /usr/share/salt-formulas/env: 0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.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 diff --git a/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch index 000c32c7..598b8568 100644 --- a/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch @@ -34,10 +34,10 @@ index 67022b0..5943e03 100755 salt -C 'cmp*' state.apply linux.system salt -C 'cmp*' state.apply linux.network || true diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 1cfcacd..58a1843 100755 +index 8c02d68..f32ebec 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -47,6 +47,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do +@@ -45,6 +45,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do rc=0 for node in $vcp_nodes; do salt "$node" test.ping 2>/dev/null || { rc=$?; break; }; diff --git a/upstream/fuel b/upstream/fuel index ae4434bd..4d4149fa 160000 --- a/upstream/fuel +++ b/upstream/fuel @@ -1 +1 @@ -Subproject commit ae4434bdf6a96e06286409aa51e8cd9975f7e8b8 +Subproject commit 4d4149faa5604836931c039ad1922f95a764bb76 -- cgit 1.2.3-korg