summaryrefslogtreecommitdiffstats
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-11-18 22:17:00 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-19 02:26:16 +0000
commitb23e59e31cddaa44361d429c2325a0f648c583c2 (patch)
treec8010b6d518714bff0cb864b8a8d3b8cfa546d89 /patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
parent8d69d6d274cfda09b86ac43eb75d002d7f9ba00e (diff)
u/fuel: Bump & rebase for netconfig rm via salt
Change-Id: I0de153ef4e5a71f350d29a90ae4c79b863d676eb Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 939bdcd9a425674eaca2d9556da4f34f11b0e23f)
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 b19103b7..ba5f2952 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 d3352cc..059e3ef 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 004f72a..b7054e9 100644
+index 7f2f572..9698875 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:
+@@ -46,21 +46,33 @@ parameters:
openstack.control:
cpu: 4
ram: 12288
@@ -197,7 +197,7 @@ index 004f72a..b7054e9 100644
disk_profile: xxlarge
net_profile: default
# stacklight.log:
-@@ -77,6 +89,9 @@ parameters:
+@@ -81,6 +93,9 @@ parameters:
openstack.proxy:
cpu: 2
ram: 2048