diff options
4 files changed, 12 insertions, 12 deletions
diff --git a/patches/opnfv-fuel/0002-salt.sh-user-data-Add-Saltstack-arm64-repo.patch b/patches/opnfv-fuel/0002-salt.sh-user-data-Add-Saltstack-arm64-repo.patch index f4302733..689736ba 100644 --- a/patches/opnfv-fuel/0002-salt.sh-user-data-Add-Saltstack-arm64-repo.patch +++ b/patches/opnfv-fuel/0002-salt.sh-user-data-Add-Saltstack-arm64-repo.patch @@ -31,10 +31,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh -index 9f88f1c..f12194b 100755 +index b291b0f..44db0a1 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh -@@ -47,6 +47,12 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END +@@ -45,6 +45,12 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list reclass cd /srv/salt/scripts diff --git a/patches/opnfv-fuel/0008-classes-baremetal-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0008-classes-baremetal-AArch64-virtio-NIC-names-sync.patch index 0bac93fb..147960ef 100644 --- a/patches/opnfv-fuel/0008-classes-baremetal-AArch64-virtio-NIC-names-sync.patch +++ b/patches/opnfv-fuel/0008-classes-baremetal-AArch64-virtio-NIC-names-sync.patch @@ -67,7 +67,7 @@ index a7b08f8..b9bd3e0 100644 master: accept_policy: open_mode 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 7a15156..7c23b68 100644 +index f73d48e..32fd829 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 @@ -25,7 +25,8 @@ parameters: @@ -369,7 +369,7 @@ index a75b41d..3979fd1 100644 master: accept_policy: open_mode 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 44301a0..31e87e4 100644 +index d919fe7..5025cd4 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 @@ -25,7 +25,8 @@ parameters: diff --git a/patches/opnfv-fuel/0015-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0015-virtng.py-virt.sls-Extend-libvirt_domain.patch index 7ac9d76d..8a8c6b1a 100644 --- a/patches/opnfv-fuel/0015-virtng.py-virt.sls-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0015-virtng.py-virt.sls-Extend-libvirt_domain.patch @@ -160,13 +160,13 @@ index 46a9556..f6504ab 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 7c23b68..395ac02 100644 +index 32fd829..78babbb 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,16 +34,25 @@ parameters: openstack.control: cpu: 4 - ram: 8192 + ram: 10240 + hw_firmware_type: uefi + virt_machine_model: virt + cpu_model: host-passthrough @@ -182,7 +182,7 @@ index 7c23b68..395ac02 100644 net_profile: default openstack.message_queue: cpu: 4 - ram: 8192 + ram: 2048 + hw_firmware_type: uefi + virt_machine_model: virt + cpu_model: host-passthrough @@ -192,7 +192,7 @@ index 7c23b68..395ac02 100644 @@ -54,6 +63,9 @@ parameters: openstack.proxy: cpu: 2 - ram: 4096 + ram: 2048 + hw_firmware_type: uefi + virt_machine_model: virt + cpu_model: host-passthrough @@ -210,13 +210,13 @@ index 7c23b68..395ac02 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 31e87e4..a7b79d4 100644 +index 5025cd4..f4c6291 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: 8192 + ram: 10240 + hw_firmware_type: uefi + virt_machine_model: virt + cpu_model: host-passthrough @@ -232,7 +232,7 @@ index 31e87e4..a7b79d4 100644 net_profile: default openstack.message_queue: cpu: 4 - ram: 8192 + ram: 2048 + hw_firmware_type: uefi + virt_machine_model: virt + cpu_model: host-passthrough @@ -248,7 +248,7 @@ index 31e87e4..a7b79d4 100644 net_profile: default openstack.proxy: cpu: 2 - ram: 4096 + ram: 2048 + hw_firmware_type: uefi + virt_machine_model: virt + cpu_model: host-passthrough diff --git a/upstream/fuel b/upstream/fuel -Subproject 98f171c82636c29a9cfd5c94c8e7aac7ca7af41 +Subproject 81c74a3da29cabc3fe76d3b5467378d84fd2767 |