diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-19 19:09:15 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-19 19:11:22 +0100 |
| commit | 9565a20367bca5df4b4273e7c4057ea4260a9475 (patch) | |
| tree | b41b55792b38986e019a2523c3e76d9c806a65e9 /patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch | |
| parent | 50708a7a564120a58b26e4285409c1abb2662d96 (diff) | |
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 <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch')
| -rw-r--r-- | patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch | 12 |
1 files changed, 6 insertions, 6 deletions
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 <Alexandru.Avadanii@enea.com> 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 |