commit 0690eae1a78bac6440dcebc7405d578e4132bf47
author Tatyana Leontovich <tleontovich@mirantis.com> Tue Aug 01 13:07:57 2017 +0300
committer Tatyanka Leontovich <tleontovich@mirantis.com> Tue Aug 01 06:08:38 2017 -0400
tree b2ef4c0e7c388886cde6a245a78156807d216700
parent 13a0fc261844300c8e95de9c348d3832b7e7ba23

Change resources for contrail mon and ctl nodes

Change-Id: I5a5623b20560cfc3cb65c95844e6407e4020d19d
Reviewed-on: https://review.gerrithub.io/372057
Reviewed-by: Tatyanka Leontovich <tleontovich@mirantis.com>
Tested-by: Tatyanka Leontovich <tleontovich@mirantis.com>

tcp_tests/templates/virtual-mcp11-k8s-contrail/common-services.yaml

diff --git a/tcp_tests/templates/virtual-mcp11-k8s-contrail/common-services.yaml b/tcp_tests/templates/virtual-mcp11-k8s-contrail/common-services.yaml
index 35d9c76..07a0a87 100644
--- a/tcp_tests/templates/virtual-mcp11-k8s-contrail/common-services.yaml
+++ b/tcp_tests/templates/virtual-mcp11-k8s-contrail/common-services.yaml
@@ -49,13 +49,6 @@
   retry: {count: 1, delay: 5}
   skip_fail: false
 
-- description: Restart rsyslog
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@haproxy:proxy' service.restart rsyslog
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
-  skip_fail: false
-
 # Isntall SL core services
 
 - description: Install gluserfs client
@@ -92,3 +85,11 @@
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
   skip_fail: false
+
+- description: Restart rsyslog
+  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
+    -C 'I@haproxy:proxy' service.restart rsyslog
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
+  skip_fail: false
+

tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay.yaml

diff --git a/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay.yaml b/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay.yaml
index 438d65c..7eafbca 100644
--- a/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay.yaml
@@ -201,7 +201,7 @@
             role: salt_minion
             params:
               vcpu: !os_env SLAVE_NODE_CPU, 2
-              memory: !os_env SLAVE_NODE_MEMORY, 4096
+              memory: !os_env SLAVE_NODE_MEMORY, 3072
               boot:
                 - hd
               cloud_init_volume_name: iso
@@ -248,7 +248,7 @@
             role: salt_minion
             params:
               vcpu: !os_env SLAVE_NODE_CPU, 2
-              memory: !os_env SLAVE_NODE_MEMORY, 4096
+              memory: !os_env SLAVE_NODE_MEMORY, 3072
               boot:
                 - hd
               cloud_init_volume_name: iso
@@ -277,7 +277,7 @@
             role: salt_minion
             params:
               vcpu: !os_env SLAVE_NODE_CPU, 2
-              memory: !os_env SLAVE_NODE_MEMORY, 4096
+              memory: !os_env SLAVE_NODE_MEMORY, 3072
               boot:
                 - hd
               cloud_init_volume_name: iso
@@ -306,7 +306,7 @@
             role: salt_minion
             params:
               vcpu: !os_env SLAVE_NODE_CPU, 2
-              memory: !os_env SLAVE_NODE_MEMORY, 4096
+              memory: !os_env SLAVE_NODE_MEMORY, 3072
               boot:
                 - hd
               cloud_init_volume_name: iso
@@ -332,7 +332,7 @@
             role: salt_minion
             params:
               vcpu: !os_env SLAVE_NODE_CPU, 2
-              memory: !os_env SLAVE_NODE_MEMORY, 4096
+              memory: !os_env SLAVE_NODE_MEMORY, 3072
               boot:
                 - hd
               cloud_init_volume_name: iso
@@ -358,7 +358,7 @@
             role: salt_minion
             params:
               vcpu: !os_env SLAVE_NODE_CPU, 1
-              memory: !os_env SLAVE_NODE_MEMORY, 1024
+              memory: !os_env SLAVE_NODE_MEMORY, 3072
               boot:
                 - hd
               cloud_init_volume_name: iso
@@ -384,7 +384,7 @@
             role: salt_minion
             params:
               vcpu: !os_env SLAVE_NODE_CPU, 1
-              memory: !os_env SLAVE_NODE_MEMORY, 1024
+              memory: !os_env SLAVE_NODE_MEMORY, 3072
               boot:
                 - hd
               cloud_init_volume_name: iso
@@ -410,7 +410,7 @@
             role: salt_minion
             params:
               vcpu: !os_env SLAVE_NODE_CPU, 1
-              memory: !os_env SLAVE_NODE_MEMORY, 1024
+              memory: !os_env SLAVE_NODE_MEMORY, 3072
               boot:
                 - hd
               cloud_init_volume_name: iso