From 992e94ddcc94eb7222ed0dcf9e2fac5a2c15b464 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 2 Oct 2017 21:23:58 +0200 Subject: u/fuel: Bump & rebase for Salt version sync Change-Id: I5641802152c4e9dc6cec3218848921be5179e815 Signed-off-by: Alexandru Avadanii (cherry picked from commit 0a09df0d8947bed263541471478049587072f33d) --- .../0009-virtng.py-virt.sls-Extend-libvirt_domain.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch') diff --git a/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch index 844c0110..8e4b97b8 100644 --- a/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch @@ -160,10 +160,10 @@ index 4d75677..2211c14 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-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml -index 5e4ea66..3b717d8 100644 +index 331a262..a328d02 100644 --- 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 -@@ -35,26 +35,41 @@ parameters: +@@ -34,26 +34,41 @@ parameters: openstack.control: cpu: 4 ram: 12288 @@ -205,7 +205,7 @@ index 5e4ea66..3b717d8 100644 disk_profile: small net_profile: default # stacklight.log: -@@ -75,6 +90,9 @@ parameters: +@@ -74,6 +89,9 @@ parameters: opendaylight.server: cpu: 4 ram: 6144 @@ -216,10 +216,10 @@ index 5e4ea66..3b717d8 100644 net_profile: default cluster: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml -index 95bacb2..0fa27e3 100644 +index 163cf5f..578979e 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml -@@ -35,21 +35,33 @@ parameters: +@@ -34,21 +34,33 @@ parameters: openstack.control: cpu: 4 ram: 12288 @@ -253,7 +253,7 @@ index 95bacb2..0fa27e3 100644 disk_profile: xxlarge net_profile: default # stacklight.log: -@@ -70,6 +82,9 @@ parameters: +@@ -69,6 +81,9 @@ parameters: openstack.proxy: cpu: 2 ram: 2048 -- cgit 1.2.3-korg