summaryrefslogtreecommitdiffstats
path: root/mcp/config
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-02-26 18:09:14 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2019-02-28 13:16:43 +0400
commit4e4b7928649577beed448004acb9ed5f33700301 (patch)
tree9e88bcd185094c95d3c75ae63d424717a8edc327 /mcp/config
parentac56d7b14f46b05f497b3dca4b6a4b0bfedd83e2 (diff)
Tune up nova/neutron intervals
Also re-align resources for virtual scenarios. Change-Id: Id0d55407fd5b1720a24e30c364219f8b08e89d06 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/config')
-rw-r--r--mcp/config/scenario/defaults.yaml.j24
-rw-r--r--mcp/config/scenario/os-nosdn-nofeature-noha.yaml3
-rw-r--r--mcp/config/scenario/os-nosdn-ovs-noha.yaml7
-rw-r--r--mcp/config/scenario/os-odl-bgpvpn-noha.yaml9
-rw-r--r--mcp/config/scenario/os-odl-nofeature-noha.yaml3
-rw-r--r--mcp/config/scenario/os-odl-ovs-noha.yaml9
-rw-r--r--mcp/config/scenario/os-odl-sfc-noha.yaml3
-rw-r--r--mcp/config/scenario/os-ovn-nofeature-noha.yaml9
8 files changed, 19 insertions, 28 deletions
diff --git a/mcp/config/scenario/defaults.yaml.j2 b/mcp/config/scenario/defaults.yaml.j2
index 4c6a86f03..4d1215f55 100644
--- a/mcp/config/scenario/defaults.yaml.j2
+++ b/mcp/config/scenario/defaults.yaml.j2
@@ -10,8 +10,8 @@
x86_64:
base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
default:
- vcpus: 2
- ram: 4096
+ vcpus: 4
+ ram: 8192
cluster: &arch_default_cluster_states
states:
- virtual_init
diff --git a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml
index 46c8bddc1..76fed8c12 100644
--- a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml
+++ b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml
@@ -21,10 +21,9 @@ virtual:
- cmp001
- cmp002
ctl01:
- vcpus: 4
ram: 14336
gtw01:
- ram: 2048
+ ram: 4096
cmp001:
vcpus: 8
ram: 16384
diff --git a/mcp/config/scenario/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/os-nosdn-ovs-noha.yaml
index de8873daf..e1cc6d768 100644
--- a/mcp/config/scenario/os-nosdn-ovs-noha.yaml
+++ b/mcp/config/scenario/os-nosdn-ovs-noha.yaml
@@ -22,13 +22,12 @@ virtual:
- cmp001
- cmp002
ctl01:
- vcpus: 4
ram: 14336
gtw01:
- ram: 2048
+ ram: 4096
cmp001:
- vcpus: 4
+ vcpus: 6
ram: 10240
cmp002:
- vcpus: 4
+ vcpus: 6
ram: 10240
diff --git a/mcp/config/scenario/os-odl-bgpvpn-noha.yaml b/mcp/config/scenario/os-odl-bgpvpn-noha.yaml
index d7c2788e6..b4db80986 100644
--- a/mcp/config/scenario/os-odl-bgpvpn-noha.yaml
+++ b/mcp/config/scenario/os-odl-bgpvpn-noha.yaml
@@ -24,16 +24,13 @@ virtual:
- cmp001
- cmp002
ctl01:
- vcpus: 4
ram: 14336
gtw01:
+ vcpus: 2
ram: 2048
odl01:
- vcpus: 4
ram: 6144
cmp001:
- vcpus: 4
- ram: 16384
+ ram: 12288
cmp002:
- vcpus: 4
- ram: 16384
+ ram: 12288
diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml b/mcp/config/scenario/os-odl-nofeature-noha.yaml
index 05632055e..c9847b9ba 100644
--- a/mcp/config/scenario/os-odl-nofeature-noha.yaml
+++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml
@@ -23,10 +23,9 @@ virtual:
- cmp001
- cmp002
ctl01:
- vcpus: 4
ram: 14336
gtw01:
+ vcpus: 2
ram: 2048
odl01:
- vcpus: 4
ram: 6144
diff --git a/mcp/config/scenario/os-odl-ovs-noha.yaml b/mcp/config/scenario/os-odl-ovs-noha.yaml
index 591e0f261..0acb5d213 100644
--- a/mcp/config/scenario/os-odl-ovs-noha.yaml
+++ b/mcp/config/scenario/os-odl-ovs-noha.yaml
@@ -24,16 +24,15 @@ virtual:
- cmp001
- cmp002
ctl01:
- vcpus: 4
ram: 14336
gtw01:
- ram: 1024
+ vcpus: 2
+ ram: 2048
odl01:
- vcpus: 4
ram: 6144
cmp001:
- vcpus: 4
+ vcpus: 6
ram: 10240
cmp002:
- vcpus: 4
+ vcpus: 6
ram: 10240
diff --git a/mcp/config/scenario/os-odl-sfc-noha.yaml b/mcp/config/scenario/os-odl-sfc-noha.yaml
index 8b0600f98..f2932c653 100644
--- a/mcp/config/scenario/os-odl-sfc-noha.yaml
+++ b/mcp/config/scenario/os-odl-sfc-noha.yaml
@@ -24,10 +24,9 @@ virtual:
- cmp001
- cmp002
ctl01:
- vcpus: 4
ram: 14336
gtw01:
+ vcpus: 2
ram: 2048
odl01:
- vcpus: 4
ram: 6144
diff --git a/mcp/config/scenario/os-ovn-nofeature-noha.yaml b/mcp/config/scenario/os-ovn-nofeature-noha.yaml
index 0369f3fe9..8dd682c39 100644
--- a/mcp/config/scenario/os-ovn-nofeature-noha.yaml
+++ b/mcp/config/scenario/os-ovn-nofeature-noha.yaml
@@ -19,11 +19,10 @@ virtual:
- cmp001
- cmp002
ctl01:
- vcpus: 4
ram: 14336
cmp001:
- vcpus: 5
- ram: 8192
+ vcpus: 6
+ ram: 10240
cmp002:
- vcpus: 5
- ram: 8192
+ vcpus: 6
+ ram: 10240