diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-09 17:35:34 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-09 17:39:19 +0200 |
| commit | aedf6ed1184ba41ecd9a27750e71d99ee35057f3 (patch) | |
| tree | 2e6c1852f2c6db47f70e6c244954883607544c9f /patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch | |
| parent | 6153067f68ffcba748d7c3577e2e0812a0f7e24d (diff) | |
u/fuel: Bump & rebase for Salt 2017.7 bump
Change-Id: Ia69496c0dfed2ac47b9d72f51e9d16956fe07c58
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch')
| -rw-r--r-- | patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch index 8480a662..3b366e41 100644 --- a/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch @@ -150,17 +150,17 @@ index 00000000..78eb0bff + + #salt_control_seed_{{ cluster_name }}_{{ node_name }}: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index baa15d79..c9dbe24a 100644 +index 2f910715..5ebc1d30 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -10,3 +10,5 @@ - /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch +@@ -11,3 +11,5 @@ /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-Disable-glance-signature-verification.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 -index 868f324f..73875b87 100644 +index 62af0893..bda52803 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml @@ -52,21 +52,33 @@ parameters: |