diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-19 16:36:43 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-23 22:23:54 +0000 |
| commit | 0328802297f0f8aa4111c4a6f35bf2d1be783ede (patch) | |
| tree | 83e2b0f113f68f8234076b415b3849228a9a73a4 /patches/opnfv-fuel/0011-virtng.py-virt.sls-Extend-libvirt_domain.patch | |
| parent | 80f273c2429dbeec6a3f03d45e7033e02822593e (diff) | |
u/fuel: Bump & rebase for PDF-compatible reclass
JIRA: ARMBAND-292
Change-Id: I913ac6ec20cd34573c0e91989d7fd49a79abafaa
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 397cd1932fae59622f3cc2d782faf68b803f4860)
Diffstat (limited to 'patches/opnfv-fuel/0011-virtng.py-virt.sls-Extend-libvirt_domain.patch')
| -rw-r--r-- | patches/opnfv-fuel/0011-virtng.py-virt.sls-Extend-libvirt_domain.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/patches/opnfv-fuel/0011-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0011-virtng.py-virt.sls-Extend-libvirt_domain.patch index 91acb494..ea2007ef 100644 --- a/patches/opnfv-fuel/0011-virtng.py-virt.sls-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0011-virtng.py-virt.sls-Extend-libvirt_domain.patch @@ -150,23 +150,23 @@ index 0000000..a9fe11b + + #salt_control_seed_{{ cluster_name }}_{{ node_name }}: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 46a9556..f6504ab 100644 +index 4d75677..2211c14 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -9,3 +9,5 @@ - /usr/share/salt-formulas/env: 0009-seedng-module-Sync-salt-version.patch +@@ -10,3 +10,5 @@ + /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch /usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.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/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml -index 76e32bc..bd4234b 100644 +index bbdf354..06a5d0c 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 @@ -34,26 +34,41 @@ parameters: openstack.control: cpu: 4 - ram: 10240 + ram: 12288 + hw_firmware_type: uefi + virt_machine_model: virt + cpu_model: host-passthrough @@ -174,7 +174,7 @@ index 76e32bc..bd4234b 100644 net_profile: default openstack.database: cpu: 4 - ram: 8192 + ram: 6144 + hw_firmware_type: uefi + virt_machine_model: virt + cpu_model: host-passthrough @@ -216,13 +216,13 @@ index 76e32bc..bd4234b 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 40e800f..27b1e07 100644 +index 0ae3f4d..4243d91 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 @@ -34,26 +34,41 @@ parameters: openstack.control: cpu: 4 - ram: 10240 + ram: 12288 + hw_firmware_type: uefi + virt_machine_model: virt + cpu_model: host-passthrough @@ -230,7 +230,7 @@ index 40e800f..27b1e07 100644 net_profile: default openstack.database: cpu: 4 - ram: 8192 + ram: 6144 + hw_firmware_type: uefi + virt_machine_model: virt + cpu_model: host-passthrough |