From 9565a20367bca5df4b4273e7c4057ea4260a9475 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 19 Dec 2017 19:09:15 +0100 Subject: u/fuel: Bump & rebase for MaaS DHCP fix While at it, adjust patch context for recently changed libvirtd socket group in salt-formula-libvirt. Change-Id: Ia2481b2c7efabdb0419999993961ee1f2fdf07fa Signed-off-by: Alexandru Avadanii --- .../0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch | 6 +++--- .../0007-libvirt-Use-libvirt-unix_sock_group.patch | 12 ++++++------ .../0009-virtng.py-virt.sls-Extend-libvirt_domain.patch | 4 ++-- patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch | 4 ++-- upstream/fuel | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) 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 09f92336..84def033 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,12 +64,12 @@ index 0000000..0368937 + file.managed: + - source: salt://maas/files/pgpass diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index a54fadc..3aa6308 100644 +index f2549d7..a2f6a19 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -15,3 +15,4 @@ - /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch +@@ -16,3 +16,4 @@ /usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch + /usr/share/salt-formulas/env: 0011-maas-region-interface-default-mode-DHCP.patch /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml 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 34833458..103fcb2d 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 @@ -22,7 +22,7 @@ Signed-off-by: Alexandru Avadanii diff --git a/mcp/patches/0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch b/mcp/patches/0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch new file mode 100644 -index 0000000..003b249 +index 0000000..34d7cb4 --- /dev/null +++ b/mcp/patches/0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch @@ -0,0 +1,21 @@ @@ -42,17 +42,17 @@ index 0000000..003b249 + # without becoming root. + # + # This is restricted to 'root' by default. -+-unix_sock_group = "libvirtd" -++unix_sock_group = "libvirt" ++-unix_sock_group = "{{ server.get('unix_sock_group', 'libvirtd') }}" +++unix_sock_group = "{{ server.get('unix_sock_group', 'libvirt') }}" + + # 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 3aa6308..7110078 100644 +index a2f6a19..36e7f73 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -16,3 +16,4 @@ - /usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch +@@ -17,3 +17,4 @@ + /usr/share/salt-formulas/env: 0011-maas-region-interface-default-mode-DHCP.patch /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.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/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch index d926a0bc..b9c10de5 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 7110078..7462165 100644 +index 36e7f73..b7c1607 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -17,3 +17,5 @@ +@@ -18,3 +18,5 @@ /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.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/0010-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch index 525652db..7aa076e5 100644 --- a/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch +++ b/patches/opnfv-fuel/0010-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 7462165..8f3e583 100644 +index b7c1607..c879a63 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -19,3 +19,4 @@ +@@ -20,3 +20,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 diff --git a/upstream/fuel b/upstream/fuel index 78878a33..dac83c66 160000 --- a/upstream/fuel +++ b/upstream/fuel @@ -1 +1 @@ -Subproject commit 78878a33010e0bbec01196dfc5cc376567512376 +Subproject commit dac83c66fa36ce532f68710a630719b6d76a4702 -- cgit 1.2.3-korg