diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-01 12:15:57 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-02 16:52:18 +0000 |
commit | f664958240ca87b430c5f423e32bed557306bad1 (patch) | |
tree | 484fa420f504b7979eb030e2b848ae1af5d2e30e /patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch | |
parent | 77e60fe7ecc572aa44e0da9e3817bd7b76078734 (diff) |
u/fuel: Bump & rebase for galera formula pinning
JIRA: ARMBAND-328
Change-Id: I5f284be5e75dc5ea740e632efc6f6c2e46de3973
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 9848bc05e89f2399f1958624055173142b6107d4)
Diffstat (limited to 'patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch')
-rw-r--r-- | patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch index aa0b9f97..59f7a609 100644 --- a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch @@ -160,7 +160,7 @@ index e355700..b2745a1 100644 +/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/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml -index 757295a..fe17fa6 100644 +index d098fa6..d88512e 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml @@ -42,21 +42,33 @@ parameters: @@ -205,7 +205,7 @@ index 757295a..fe17fa6 100644 + virt_machine_model: virt + cpu_model: host-passthrough disk_profile: small - net_profile: default + net_profile: default_ext cluster: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml index d7bbadd..f8b9662 100644 |