From b0c72d0c9bf3ccdf2549d9f5ddeca49085aae636 Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
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 <mpolenchuk@mirantis.com>
(cherry picked from commit 87310fb8edfe49b9621fe4410ae52d989072e3c5)
---
 mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml | 5 ++++-
 mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml       | 5 ++++-
 mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml   | 5 ++++-
 mcp/config/states/maas                                   | 3 +++
 4 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'mcp/config')

diff --git a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
index 780edbd81..ad1b8a7ab 100644
--- a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
@@ -8,6 +8,9 @@ virtual:
   nodes:
     - cfg01
     - mas01
+  cfg01:
+    vcpus: 4
+    ram: 6144
   mas01:
     vcpus: 4
-    ram: 16384
+    ram: 6144
diff --git a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
index 6e55038fc..c5820be09 100644
--- a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
@@ -9,6 +9,9 @@ virtual:
   nodes:
     - cfg01
     - mas01
+  cfg01:
+    vcpus: 4
+    ram: 6144
   mas01:
     vcpus: 4
-    ram: 16384
+    ram: 6144
diff --git a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
index 2d5339068..20d9107ca 100644
--- a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
@@ -9,6 +9,9 @@ virtual:
   nodes:
     - cfg01
     - mas01
+  cfg01:
+    vcpus: 4
+    ram: 6144
   mas01:
     vcpus: 4
-    ram: 16384
+    ram: 6144
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index 0d733bafa..11c89c99b 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -111,3 +111,6 @@ wait_for 10 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp |
 
 wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_USER} \
   $(awk 'NR==1{print $2}' "$(eval echo "~${SUDO_USER}/.ssh/authorized_keys")")"
+
+# Get the latest packages
+salt '*' pkg.upgrade refresh=False
-- 
cgit 1.2.3-korg