From b0c72d0c9bf3ccdf2549d9f5ddeca49085aae636 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Fri, 22 Sep 2017 18:28:58 +0400 Subject: Adjust memory allocation size * [baremetal] add memory to contollers & salt master * tune up sysctl vm.dirty* for compute nodes * upgrade packages to get the latest versions (https://bugs.launchpad.net/cinder/+bug/1641312) Change-Id: I9ad22206f2f3f11e1da3f93c7a0931c592adf1cf Signed-off-by: Michael Polenchuk (cherry picked from commit 87310fb8edfe49b9621fe4410ae52d989072e3c5) --- mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml | 4 ++-- .../classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml | 5 +++++ .../classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml | 4 ++-- .../cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml | 4 ++++ mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml | 4 ++-- .../classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml | 5 +++++ .../classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml | 5 +++++ 7 files changed, 25 insertions(+), 6 deletions(-) (limited to 'mcp/reclass/classes') 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 acd6a6d34..e55bcbf25 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 @@ -32,12 +32,12 @@ parameters: ##Default production sizing openstack.control: cpu: 4 - ram: 10240 + ram: 12288 disk_profile: small net_profile: default openstack.database: cpu: 4 - ram: 8192 + ram: 6144 disk_profile: large net_profile: default openstack.message_queue: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml index c5333fe76..d2495c26a 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml @@ -58,6 +58,11 @@ parameters: group: nova opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}" linux: + system: + kernel: + sysctl: + vm.dirty_ratio: 10 + vm.dirty_background_ratio: 5 network: bridge: openvswitch interface: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml index d77aeff7a..266f2ba65 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml @@ -32,12 +32,12 @@ parameters: ##Default production sizing openstack.control: cpu: 4 - ram: 10240 + ram: 12288 disk_profile: small net_profile: default openstack.database: cpu: 4 - ram: 8192 + ram: 6144 disk_profile: large net_profile: default openstack.message_queue: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml index 8c83c4a00..126751c4b 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml @@ -51,6 +51,10 @@ parameters: opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}" linux: system: + kernel: + sysctl: + vm.dirty_ratio: 10 + vm.dirty_background_ratio: 5 repo: uca: source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" 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 7550c1af8..e413a4906 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 @@ -32,12 +32,12 @@ parameters: ##Default production sizing openstack.control: cpu: 4 - ram: 10240 + ram: 12288 disk_profile: small net_profile: default openstack.database: cpu: 4 - ram: 8192 + ram: 6144 disk_profile: large net_profile: default openstack.message_queue: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml index 93a26b19e..c0f423f29 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml @@ -41,6 +41,11 @@ parameters: group: nova opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}" linux: + system: + kernel: + sysctl: + vm.dirty_ratio: 10 + vm.dirty_background_ratio: 5 network: bridge: openvswitch interface: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml index 978f468e6..99f517f8a 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml @@ -53,6 +53,11 @@ parameters: fstype: nfs device: ${_param:openstack_control_address}:/srv/nova/instances linux: + system: + kernel: + sysctl: + vm.dirty_ratio: 10 + vm.dirty_background_ratio: 5 network: bridge: openvswitch interface: -- cgit 1.2.3-korg