Fix contrail deployment
* As a workaround k8s API is listening on ens04 interface.
* Image sizes were reduced
* Deployment was fix in accordance to latest fixes in
Orchestrate.groovy
* Universer was enabled to allow to install python-zmq for ubuntu 14.04
Change-Id: I66f80fbdd90c6527ac083fc516ab81ec1d9e8c1c
Signed-off-by: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
Reviewed-on: https://review.gerrithub.io/363529
Reviewed-by: Tatyanka Leontovich <tleontovich@mirantis.com>
Tested-by: Tatyanka Leontovich <tleontovich@mirantis.com>
diff --git a/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay.yaml b/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay.yaml
index 541b829..8187fb9 100644
--- a/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp11-k8s-contrail/underlay.yaml
@@ -1,4 +1,4 @@
-# Set the repository suite, one of the: 'nightly', 'testing', 'stable', or any other required
+# This environment requires 50.5 GB of RAM and 270GB of Storage. Run with caution.
{% set REPOSITORY_SUITE = os_env('REPOSITORY_SUITE', 'stable') %}
{% import 'virtual-mcp11-k8s-contrail/underlay--meta-data.yaml' as CLOUDINIT_META_DATA with context %}
@@ -154,7 +154,7 @@
- name: {{ HOSTNAME_CFG01 }}
role: salt_master
params:
- vcpu: !os_env SLAVE_NODE_CPU, 4
+ vcpu: !os_env SLAVE_NODE_CPU, 2
memory: !os_env SLAVE_NODE_MEMORY, 2048
boot:
- hd
@@ -162,7 +162,7 @@
cloud_init_iface_up: ens3
volumes:
- name: system
- capacity: !os_env NODE_VOLUME_SIZE, 150
+ capacity: !os_env NODE_VOLUME_SIZE, 20
backing_store: cloudimage1604
format: qcow2
- name: iso # Volume with name 'iso' will be used
@@ -199,15 +199,15 @@
- name: {{ HOSTNAME_CTL01 }}
role: salt_minion
params:
- vcpu: !os_env SLAVE_NODE_CPU, 4
- memory: !os_env SLAVE_NODE_MEMORY, 8192
+ vcpu: !os_env SLAVE_NODE_CPU, 2
+ memory: !os_env SLAVE_NODE_MEMORY, 4096
boot:
- hd
cloud_init_volume_name: iso
cloud_init_iface_up: ens3
volumes:
- name: system
- capacity: !os_env NODE_VOLUME_SIZE, 150
+ capacity: !os_env NODE_VOLUME_SIZE, 20
backing_store: cloudimage1604
format: qcow2
- name: cinder
@@ -246,15 +246,15 @@
- name: {{ HOSTNAME_CTL02 }}
role: salt_minion
params:
- vcpu: !os_env SLAVE_NODE_CPU, 4
- memory: !os_env SLAVE_NODE_MEMORY, 8192
+ vcpu: !os_env SLAVE_NODE_CPU, 2
+ memory: !os_env SLAVE_NODE_MEMORY, 4096
boot:
- hd
cloud_init_volume_name: iso
cloud_init_iface_up: ens3
volumes:
- name: system
- capacity: !os_env NODE_VOLUME_SIZE, 150
+ capacity: !os_env NODE_VOLUME_SIZE, 20
backing_store: cloudimage1604
format: qcow2
- name: cinder
@@ -275,15 +275,15 @@
- name: {{ HOSTNAME_CTL03 }}
role: salt_minion
params:
- vcpu: !os_env SLAVE_NODE_CPU, 4
- memory: !os_env SLAVE_NODE_MEMORY, 8192
+ vcpu: !os_env SLAVE_NODE_CPU, 2
+ memory: !os_env SLAVE_NODE_MEMORY, 4096
boot:
- hd
cloud_init_volume_name: iso
cloud_init_iface_up: ens3
volumes:
- name: system
- capacity: !os_env NODE_VOLUME_SIZE, 150
+ capacity: !os_env NODE_VOLUME_SIZE, 20
backing_store: cloudimage1604
format: qcow2
- name: cinder
@@ -304,7 +304,7 @@
- name: {{ HOSTNAME_CMP01 }}
role: salt_minion
params:
- vcpu: !os_env SLAVE_NODE_CPU, 4
+ vcpu: !os_env SLAVE_NODE_CPU, 2
memory: !os_env SLAVE_NODE_MEMORY, 4096
boot:
- hd
@@ -312,7 +312,7 @@
cloud_init_iface_up: ens3
volumes:
- name: system
- capacity: !os_env NODE_VOLUME_SIZE, 150
+ capacity: !os_env NODE_VOLUME_SIZE, 20
backing_store: cloudimage1604
format: qcow2
- name: iso # Volume with name 'iso' will be used
@@ -330,7 +330,7 @@
- name: {{ HOSTNAME_CMP02 }}
role: salt_minion
params:
- vcpu: !os_env SLAVE_NODE_CPU, 4
+ vcpu: !os_env SLAVE_NODE_CPU, 2
memory: !os_env SLAVE_NODE_MEMORY, 4096
boot:
- hd
@@ -338,7 +338,7 @@
cloud_init_iface_up: ens3
volumes:
- name: system
- capacity: !os_env NODE_VOLUME_SIZE, 150
+ capacity: !os_env NODE_VOLUME_SIZE, 20
backing_store: cloudimage1604
format: qcow2
- name: iso # Volume with name 'iso' will be used
@@ -356,7 +356,7 @@
- name: {{ HOSTNAME_MON01 }}
role: salt_minion
params:
- vcpu: !os_env SLAVE_NODE_CPU, 4
+ vcpu: !os_env SLAVE_NODE_CPU, 1
memory: !os_env SLAVE_NODE_MEMORY, 1024
boot:
- hd
@@ -364,7 +364,7 @@
cloud_init_iface_up: ens3
volumes:
- name: system
- capacity: !os_env NODE_VOLUME_SIZE, 150
+ capacity: !os_env NODE_VOLUME_SIZE, 20
backing_store: cloudimage1604
format: qcow2
- name: iso # Volume with name 'iso' will be used
@@ -382,7 +382,7 @@
- name: {{ HOSTNAME_MON02 }}
role: salt_minion
params:
- vcpu: !os_env SLAVE_NODE_CPU, 4
+ vcpu: !os_env SLAVE_NODE_CPU, 1
memory: !os_env SLAVE_NODE_MEMORY, 1024
boot:
- hd
@@ -390,7 +390,7 @@
cloud_init_iface_up: ens3
volumes:
- name: system
- capacity: !os_env NODE_VOLUME_SIZE, 150
+ capacity: !os_env NODE_VOLUME_SIZE, 20
backing_store: cloudimage1604
format: qcow2
- name: iso # Volume with name 'iso' will be used
@@ -408,7 +408,7 @@
- name: {{ HOSTNAME_MON03 }}
role: salt_minion
params:
- vcpu: !os_env SLAVE_NODE_CPU, 4
+ vcpu: !os_env SLAVE_NODE_CPU, 1
memory: !os_env SLAVE_NODE_MEMORY, 1024
boot:
- hd
@@ -416,7 +416,7 @@
cloud_init_iface_up: ens3
volumes:
- name: system
- capacity: !os_env NODE_VOLUME_SIZE, 150
+ capacity: !os_env NODE_VOLUME_SIZE, 20
backing_store: cloudimage1604
format: qcow2
- name: iso # Volume with name 'iso' will be used
@@ -435,14 +435,14 @@
role: salt_minion
params:
vcpu: !os_env SLAVE_NODE_CPU, 4
- memory: !os_env SLAVE_NODE_MEMORY, 1024
+ memory: !os_env SLAVE_NODE_MEMORY, 8192
boot:
- hd
cloud_init_volume_name: iso
cloud_init_iface_up: ens3
volumes:
- name: system
- capacity: !os_env NODE_VOLUME_SIZE, 150
+ capacity: !os_env NODE_VOLUME_SIZE, 20
backing_store: cloudimage1404
format: qcow2
- name: iso # Volume with name 'iso' will be used
@@ -461,14 +461,14 @@
role: salt_minion
params:
vcpu: !os_env SLAVE_NODE_CPU, 4
- memory: !os_env SLAVE_NODE_MEMORY, 1024
+ memory: !os_env SLAVE_NODE_MEMORY, 8192
boot:
- hd
cloud_init_volume_name: iso
cloud_init_iface_up: ens3
volumes:
- name: system
- capacity: !os_env NODE_VOLUME_SIZE, 150
+ capacity: !os_env NODE_VOLUME_SIZE, 20
backing_store: cloudimage1404
format: qcow2
- name: iso # Volume with name 'iso' will be used
@@ -487,14 +487,14 @@
role: salt_minion
params:
vcpu: !os_env SLAVE_NODE_CPU, 4
- memory: !os_env SLAVE_NODE_MEMORY, 1024
+ memory: !os_env SLAVE_NODE_MEMORY, 8192
boot:
- hd
cloud_init_volume_name: iso
cloud_init_iface_up: ens3
volumes:
- name: system
- capacity: !os_env NODE_VOLUME_SIZE, 150
+ capacity: !os_env NODE_VOLUME_SIZE, 20
backing_store: cloudimage1404
format: qcow2
- name: iso # Volume with name 'iso' will be used
@@ -512,7 +512,7 @@
- name: {{ HOSTNAME_PRX01 }}
role: salt_minion
params:
- vcpu: !os_env SLAVE_NODE_CPU, 4
+ vcpu: !os_env SLAVE_NODE_CPU, 2
memory: !os_env SLAVE_NODE_MEMORY, 1024
boot:
- hd
@@ -520,7 +520,7 @@
cloud_init_iface_up: ens3
volumes:
- name: system
- capacity: !os_env NODE_VOLUME_SIZE, 150
+ capacity: !os_env NODE_VOLUME_SIZE, 20
backing_store: cloudimage1604
format: qcow2
- name: iso # Volume with name 'iso' will be used
@@ -539,12 +539,12 @@
role: vsrx
params:
vcpu: !os_env SLAVE_NODE_CPU, 2
- memory: !os_env SLAVE_NODE_MEMORY, 2048
+ memory: !os_env SLAVE_NODE_MEMORY, 512
boot:
- hd
volumes:
- name: system
- capacity: !os_env NODE_VOLUME_SIZE, 150
+ capacity: !os_env NODE_VOLUME_SIZE, 10
backing_store: vsrx_image
format: qcow2
#- name: iso