diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-06-25 14:58:29 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-06-25 15:00:09 +0200 |
| commit | 4ae4cffa56eb41ce1552354df11c328472e5c73e (patch) | |
| tree | 8292d2a60a2d94fcf4295d2a4fcb78291a80490b | |
| parent | 85efa248f9aab958369c44e6da4c9b0cbba4da3b (diff) | |
u/fuel: Bump & rebase for maasng boot-resources
Change-Id: I067fcde1bff66d100b1d052820217065fec2ea38
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
| -rw-r--r-- | patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch | 6 | ||||
| m--------- | upstream/fuel | 0 |
2 files changed, 3 insertions, 3 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 -Subproject 3772a3e49e09f6cf9864c56a3ac0170cc013432 +Subproject 3ed2d8dab3d75628cd1f7edd47051623c643592 |