From 4ae4cffa56eb41ce1552354df11c328472e5c73e Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 25 Jun 2018 14:58:29 +0200 Subject: u/fuel: Bump & rebase for maasng boot-resources Change-Id: I067fcde1bff66d100b1d052820217065fec2ea38 Signed-off-by: Alexandru Avadanii --- .../opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch | 6 +++--- upstream/fuel | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch index ef3a6f8d..0753ad05 100644 --- a/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch @@ -150,13 +150,13 @@ index 00000000..78eb0bff + + #salt_control_seed_{{ cluster_name }}_{{ node_name }}: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index fbc671f3..51c9f437 100644 +index 4d22c617..e6827aa2 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -14,3 +14,5 @@ +@@ -12,3 +12,5 @@ + /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch /usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch /usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.patch - /usr/share/salt-formulas/env: 0016-Set-boot-source-selections.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/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml diff --git a/upstream/fuel b/upstream/fuel index 3772a3e4..3ed2d8da 160000 --- a/upstream/fuel +++ b/upstream/fuel @@ -1 +1 @@ -Subproject commit 3772a3e49e09f6cf9864c56a3ac0170cc0134329 +Subproject commit 3ed2d8dab3d75628cd1f7edd47051623c643592c -- cgit 1.2.3-korg