aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-15 19:59:19 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-15 21:13:59 +0100
commite02b8d4f72f2a84c857b1e8bda380f586e679ad0 (patch)
tree7592827e7ea8c4f2d286a24c5c3f21db1b05267a /patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
parentf191bfb674a3a12fab3dbb304af982e8675d3d98 (diff)
p/fuel: Pin glusterfs to 3.12 for AArch64
glusterfs PPA for 3.13 does not have arm64 binaries *yet*, so pin to 3.12 for now. While at it, bump Fuel@OPNFV submodule. Change-Id: I989fcfa43748015e46d760b9908c633238dae574 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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.patch6
1 files changed, 3 insertions, 3 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 0b58bd3..a09c728 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,10 +160,10 @@ index fe3ff14..5d28cfa 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-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
-index 6ed97fb..d8f9087 100644
+index 23f09a7..b28f479 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
-@@ -51,21 +51,33 @@ parameters:
+@@ -48,21 +48,33 @@ parameters:
openstack.control:
cpu: 4
ram: 12288
@@ -197,7 +197,7 @@ index 6ed97fb..d8f9087 100644
disk_profile: xxlarge
net_profile: default
# stacklight.log:
-@@ -86,6 +98,9 @@ parameters:
+@@ -83,6 +95,9 @@ parameters:
openstack.proxy:
cpu: 2
ram: 2048