Merge branch 'master' of https://github.com/Mirantis/tcp-qa
diff --git a/tcp_tests/templates/common-services/mk22-lab-basic-common-services.yaml b/tcp_tests/templates/common-services/mk22-lab-basic-common-services.yaml
index 86914f5..db1d0a5 100644
--- a/tcp_tests/templates/common-services/mk22-lab-basic-common-services.yaml
+++ b/tcp_tests/templates/common-services/mk22-lab-basic-common-services.yaml
@@ -4,13 +4,13 @@
keepalived
node_name: cfg01.mk22-lab-basic.local
retry: {count: 3, delay: 5}
- skip_fail: false
+ skip_fail: true
- description: Install keepalived on other controllers
cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'ctl*' state.sls
keepalived -b 1
node_name: cfg01.mk22-lab-basic.local
- retry: {count: 3, delay: 5}
- skip_fail: false
+ retry: {count: 10, delay: 10}
+ skip_fail: true
- description: Check the VIP
cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'ctl*' cmd.run
'ip a | grep 172.16.10.254' | grep -B1 172.16.10.254
diff --git a/tcp_tests/templates/openstack/mk22-lab-advanced-openstack.yaml b/tcp_tests/templates/openstack/mk22-lab-advanced-openstack.yaml
index bdb7006..75cabe3 100644
--- a/tcp_tests/templates/openstack/mk22-lab-advanced-openstack.yaml
+++ b/tcp_tests/templates/openstack/mk22-lab-advanced-openstack.yaml
@@ -125,7 +125,7 @@
node_name: cfg01.mk22-lab-advanced.local
retry: {count: 3, delay: 5}
skip_fail: false
-- description: Install contrail database on controllers
+- description: Install opencontrail on controllers
cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'ctl*' state.sls
opencontrail -b 1
node_name: cfg01.mk22-lab-advanced.local
diff --git a/tcp_tests/templates/openstack/mk22-lab-basic-openstack.yaml b/tcp_tests/templates/openstack/mk22-lab-basic-openstack.yaml
index 11bc50b..b69285c 100644
--- a/tcp_tests/templates/openstack/mk22-lab-basic-openstack.yaml
+++ b/tcp_tests/templates/openstack/mk22-lab-basic-openstack.yaml
@@ -114,6 +114,12 @@
skip_fail: true
# Install contrail on controllers
+- description: Workaround of the bug https://mirantis.jira.com/browse/PROD-8164
+ cmd: salt --hard-crash --state-output=mixed --state-verbose=False '*' grains.set noservices True
+ node_name: cfg01.mk22-lab-basic.local
+ retry: {count: 3, delay: 5}
+ skip_fail: false
+
- description: Install contrail database on controllers
cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'ctl*' state.sls
opencontrail.database -b 1
@@ -125,7 +131,7 @@
node_name: cfg01.mk22-lab-basic.local
retry: {count: 3, delay: 5}
skip_fail: false
-- description: Install contrail database on controllers
+- description: Install opencontrail on controllers
cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'ctl*' state.sls
opencontrail -b 1
node_name: cfg01.mk22-lab-basic.local
@@ -191,7 +197,7 @@
cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'cmp*' cmd.run
'ip a'
node_name: cfg01.mk22-lab-basic.local
- retry: {count: 3, delay: 5}
+ retry: {count: 10, delay: 30}
skip_fail: false
- description: Check contrail status on computes
cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'cmp*' cmd.run
diff --git a/tcp_tests/templates/salt/mk22-lab-basic-salt.yaml b/tcp_tests/templates/salt/mk22-lab-basic-salt.yaml
index f32daea..a9b1434 100644
--- a/tcp_tests/templates/salt/mk22-lab-basic-salt.yaml
+++ b/tcp_tests/templates/salt/mk22-lab-basic-salt.yaml
@@ -1,8 +1,10 @@
# Install salt to the config node
- description: Configure tcpcloud repository on the cfg01 node
- cmd: echo 'deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ xenial main security extra tcp tcp-salt' > /etc/apt/sources.list;
+ cmd: echo 'deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ xenial main security tcp tcp-salt' > /etc/apt/sources.list;
echo 'deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ trusty tcp-salt' >> /etc/apt/sources.list;
- wget -O - http://apt.tcpcloud.eu/public.gpg | apt-key add -
+ wget -O - http://apt.tcpcloud.eu/public.gpg | apt-key add -;
+ echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest xenial main" > /etc/apt/sources.list.d/saltstack.list;
+ wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub | apt-key add -;
node_name: cfg01.mk22-lab-basic.local
retry: {count: 1, delay: 1}
skip_fail: false
@@ -193,7 +195,7 @@
update && apt-get -y upgrade'
node_name: cfg01.mk22-lab-basic.local
retry: {count: 3, delay: 5}
- skip_fail: false
+ skip_fail: true
- description: '*Workaround* for the bug https://mirantis.jira.com/browse/PROD-8021'
cmd: salt --hard-crash --state-output=mixed --state-verbose=False '*' cmd.run 'apt-get
diff --git a/tcp_tests/templates/underlay/mk22-lab-advanced--user-data-cfg01.yaml b/tcp_tests/templates/underlay/mk22-lab-advanced--user-data-cfg01.yaml
index ef53c9b..31f60a7 100644
--- a/tcp_tests/templates/underlay/mk22-lab-advanced--user-data-cfg01.yaml
+++ b/tcp_tests/templates/underlay/mk22-lab-advanced--user-data-cfg01.yaml
@@ -34,6 +34,12 @@
#- sudo route add default gw {gateway} {interface_name}
- sudo ifup ens4
+ # Create swap
+ - fallocate -l 4G /swapfile
+ - chmod 600 /swapfile
+ - mkswap /swapfile
+ - swapon /swapfile
+ - echo "/swapfile none swap defaults 0 0" >> /etc/fstab
########################################################
# Node is ready, allow SSH access
diff --git a/tcp_tests/templates/underlay/mk22-lab-advanced--user-data.yaml b/tcp_tests/templates/underlay/mk22-lab-advanced--user-data.yaml
deleted file mode 100644
index b0dee66..0000000
--- a/tcp_tests/templates/underlay/mk22-lab-advanced--user-data.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
-| # All the data below will be stored as a string object
- #cloud-config, see http://cloudinit.readthedocs.io/en/latest/topics/examples.html
-
- ssh_pwauth: True
- users:
- - name: root
- sudo: ALL=(ALL) NOPASSWD:ALL
- shell: /bin/bash
- ssh_authorized_keys:
- - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGwjUlYn9UsmWmAGSuEA2sICad7WqxgsJR0HKcMbbxi0tn96h4Cq2iGYmzlJ48egLm5R5pxyWnFvL4b/2zb+kKTPCMwRc9nv7xEGosEFNQEoSDd+gYu2CO0dgS2bX/7m2DXmzvhqPjxWQUXXsb0OYAS1r9Es65FE8y4rLaegz8V35xfH45bTCA0W8VSKh264XtGz12hacqsttE/UvyjJTZe+/XV+xJy3WAWxe8J/MuW1VqbqNewTmpTE/LJU8i6pG4msU6+wH99UvsGAOKQOduynUHKWG3VZg5YCjpbbV/t/pfW/vHB3b3jiifQmNhulyiG/CNnSQ5BahtV/7qPsYt vagrant@cfg01
-
- disable_root: false
- chpasswd:
- list: |
- root:r00tme
- expire: False
-
- bootcmd:
- # Block access to SSH while node is preparing
- - cloud-init-per once sudo iptables -A INPUT -p tcp --dport 22 -j DROP
- # Enable root access
- - sed -i'.orig' -e's/without-password/yes/' /etc/ssh/sshd_config
- - service sshd restart
- output:
- all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
-
- runcmd:
- # Configure dhclient
- - sudo echo "nameserver {gateway}" >> /etc/resolvconf/resolv.conf.d/base
- - sudo resolvconf -u
-
- # Prepare network connection
- - sudo ifup eth0
- #- sudo route add default gw {gateway} {interface_name}
- - sudo ifup eth1
-
- ############## TCP Cloud cfg01 node ##################
- #- sleep 120
- - echo "Preparing base OS"
- - which wget >/dev/null || (apt-get update; apt-get install -y wget)
-
- - echo "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ trusty main security extra tcp tcp-salt" > /etc/apt/sources.list
- - wget -O - http://apt.tcpcloud.eu/public.gpg | apt-key add -
- # saltstack repo is for minions that have the same version in the xenial and trusty (2016.3.3)
- - echo "deb http://repo.saltstack.com/apt/ubuntu/14.04/amd64/latest trusty main" > /etc/apt/sources.list.d/saltstack.list
- - wget -O - https://repo.saltstack.com/apt/ubuntu/14.04/amd64/latest/SALTSTACK-GPG-KEY.pub | apt-key add -
-
- - apt-get clean
- - apt-get update
- - apt-get -y upgrade
-
- # Install common packages
- - apt-get install -y python-pip git
- - apt-get install -y curl tmux byobu iputils-ping traceroute htop tree
-
- - apt-get install -y salt-minion
-
- # To be configured from inventory/fuel-devops by operator or autotests
- - 'echo "id: {hostname}" >> /etc/salt/minion'
- - 'echo "master: 172.16.10.100" >> /etc/salt/minion'
-
- - echo "Restarting minion service with workarounds..."
- - rm -f /etc/salt/pki/minion/minion_master.pub
- - service salt-minion restart
- - sleep 5
- - rm -f /etc/salt/pki/minion/minion_master.pub
- - service salt-minion restart
-
- #- echo "Showing node metadata..."
- #- salt-call pillar.data
-
- #- echo "Running complete state ..."
- #- salt-call state.sls linux,openssh,salt
-
- ########################################################
- # Node is ready, allow SSH access
- - echo "Allow SSH access ..."
- - sudo iptables -D INPUT -p tcp --dport 22 -j DROP
- ########################################################
-
- write_files:
- - path: /etc/network/interfaces.d/99-tcp-tests.cfg
- content: |
- auto eth0
- iface eth0 inet dhcp
- auto eth1
- iface eth1 inet dhcp
diff --git a/tcp_tests/templates/underlay/mk22-lab-advanced--user-data1404.yaml b/tcp_tests/templates/underlay/mk22-lab-advanced--user-data1404.yaml
index b0dee66..da65e87 100644
--- a/tcp_tests/templates/underlay/mk22-lab-advanced--user-data1404.yaml
+++ b/tcp_tests/templates/underlay/mk22-lab-advanced--user-data1404.yaml
@@ -34,6 +34,13 @@
#- sudo route add default gw {gateway} {interface_name}
- sudo ifup eth1
+ # Create swap
+ - fallocate -l 4G /swapfile
+ - chmod 600 /swapfile
+ - mkswap /swapfile
+ - swapon /swapfile
+ - echo "/swapfile none swap defaults 0 0" >> /etc/fstab
+
############## TCP Cloud cfg01 node ##################
#- sleep 120
- echo "Preparing base OS"
diff --git a/tcp_tests/templates/underlay/mk22-lab-advanced--user-data1604.yaml b/tcp_tests/templates/underlay/mk22-lab-advanced--user-data1604.yaml
index 6dc264a..4951802 100644
--- a/tcp_tests/templates/underlay/mk22-lab-advanced--user-data1604.yaml
+++ b/tcp_tests/templates/underlay/mk22-lab-advanced--user-data1604.yaml
@@ -34,6 +34,13 @@
#- sudo route add default gw {gateway} {interface_name}
- sudo ifup ens4
+ # Create swap
+ - fallocate -l 4G /swapfile
+ - chmod 600 /swapfile
+ - mkswap /swapfile
+ - swapon /swapfile
+ - echo "/swapfile none swap defaults 0 0" >> /etc/fstab
+
############## TCP Cloud cfg01 node ##################
#- sleep 120
- echo "Preparing base OS"
diff --git a/tcp_tests/templates/underlay/mk22-lab-advanced.yaml b/tcp_tests/templates/underlay/mk22-lab-advanced.yaml
index 61a5ac3..da8b160 100644
--- a/tcp_tests/templates/underlay/mk22-lab-advanced.yaml
+++ b/tcp_tests/templates/underlay/mk22-lab-advanced.yaml
@@ -85,7 +85,7 @@
role: salt_master
params:
vcpu: !os_env SLAVE_NODE_CPU, 4
- memory: !os_env SLAVE_NODE_MEMORY, 8192
+ memory: !os_env SLAVE_NODE_MEMORY, 2048
boot:
- hd
cloud_init_volume_name: iso
@@ -123,7 +123,7 @@
role: salt_minion
params:
vcpu: !os_env SLAVE_NODE_CPU, 4
- memory: !os_env SLAVE_NODE_MEMORY, 12400
+ memory: !os_env SLAVE_NODE_MEMORY, 8192
boot:
- hd
cloud_init_volume_name: iso
@@ -161,7 +161,7 @@
role: salt_minion
params:
vcpu: !os_env SLAVE_NODE_CPU, 4
- memory: !os_env SLAVE_NODE_MEMORY, 12400
+ memory: !os_env SLAVE_NODE_MEMORY, 8192
boot:
- hd
cloud_init_volume_name: iso
@@ -187,7 +187,7 @@
role: salt_minion
params:
vcpu: !os_env SLAVE_NODE_CPU, 4
- memory: !os_env SLAVE_NODE_MEMORY, 12400
+ memory: !os_env SLAVE_NODE_MEMORY, 8192
boot:
- hd
cloud_init_volume_name: iso
@@ -239,7 +239,7 @@
role: salt_minion
params:
vcpu: !os_env SLAVE_NODE_CPU, 4
- memory: !os_env SLAVE_NODE_MEMORY, 8192
+ memory: !os_env SLAVE_NODE_MEMORY, 4096
boot:
- hd
cloud_init_volume_name: iso
diff --git a/tcp_tests/templates/underlay/mk22-lab-basic--user-data-cfg01.yaml b/tcp_tests/templates/underlay/mk22-lab-basic--user-data-cfg01.yaml
index ef53c9b..31f60a7 100644
--- a/tcp_tests/templates/underlay/mk22-lab-basic--user-data-cfg01.yaml
+++ b/tcp_tests/templates/underlay/mk22-lab-basic--user-data-cfg01.yaml
@@ -34,6 +34,12 @@
#- sudo route add default gw {gateway} {interface_name}
- sudo ifup ens4
+ # Create swap
+ - fallocate -l 4G /swapfile
+ - chmod 600 /swapfile
+ - mkswap /swapfile
+ - swapon /swapfile
+ - echo "/swapfile none swap defaults 0 0" >> /etc/fstab
########################################################
# Node is ready, allow SSH access
diff --git a/tcp_tests/templates/underlay/mk22-lab-basic--user-data.yaml b/tcp_tests/templates/underlay/mk22-lab-basic--user-data.yaml
deleted file mode 100644
index b28d428..0000000
--- a/tcp_tests/templates/underlay/mk22-lab-basic--user-data.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
-| # All the data below will be stored as a string object
- #cloud-config, see http://cloudinit.readthedocs.io/en/latest/topics/examples.html
-
- ssh_pwauth: True
- users:
- - name: root
- sudo: ALL=(ALL) NOPASSWD:ALL
- shell: /bin/bash
- ssh_authorized_keys:
- - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGwjUlYn9UsmWmAGSuEA2sICad7WqxgsJR0HKcMbbxi0tn96h4Cq2iGYmzlJ48egLm5R5pxyWnFvL4b/2zb+kKTPCMwRc9nv7xEGosEFNQEoSDd+gYu2CO0dgS2bX/7m2DXmzvhqPjxWQUXXsb0OYAS1r9Es65FE8y4rLaegz8V35xfH45bTCA0W8VSKh264XtGz12hacqsttE/UvyjJTZe+/XV+xJy3WAWxe8J/MuW1VqbqNewTmpTE/LJU8i6pG4msU6+wH99UvsGAOKQOduynUHKWG3VZg5YCjpbbV/t/pfW/vHB3b3jiifQmNhulyiG/CNnSQ5BahtV/7qPsYt vagrant@cfg01
-
- disable_root: false
- chpasswd:
- list: |
- root:r00tme
- expire: False
-
- bootcmd:
- # Block access to SSH while node is preparing
- - cloud-init-per once sudo iptables -A INPUT -p tcp --dport 22 -j DROP
- # Enable root access
- - sed -i -e '/^PermitRootLogin/s/^.*$/PermitRootLogin yes/' /etc/ssh/sshd_config
- - service sshd restart
- output:
- all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
-
- runcmd:
- # Configure dhclient
- - sudo echo "nameserver {gateway}" >> /etc/resolvconf/resolv.conf.d/base
- - sudo resolvconf -u
-
- # Prepare network connection
- - sudo ifup eth0
- #- sudo route add default gw {gateway} {interface_name}
- - sudo ifup eth1
-
- ############## TCP Cloud cfg01 node ##################
- #- sleep 120
- - echo "Preparing base OS"
- - which wget >/dev/null || (apt-get update; apt-get install -y wget)
-
- - echo "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ trusty main security extra tcp tcp-salt" > /etc/apt/sources.list
- - wget -O - http://apt.tcpcloud.eu/public.gpg | apt-key add -
- # saltstack repo is for minions that have the same version in the xenial and trusty (2016.3.3)
- - echo "deb http://repo.saltstack.com/apt/ubuntu/14.04/amd64/latest trusty main" > /etc/apt/sources.list.d/saltstack.list
- - wget -O - https://repo.saltstack.com/apt/ubuntu/14.04/amd64/latest/SALTSTACK-GPG-KEY.pub | apt-key add -
-
- - apt-get clean
- - apt-get update
- - apt-get -y upgrade
-
- # Install common packages
- - apt-get install -y python-pip git
- - apt-get install -y curl tmux byobu iputils-ping traceroute htop tree
-
- - apt-get install -y salt-minion
-
- # To be configured from inventory/fuel-devops by operator or autotests
- - 'echo "id: {hostname}" >> /etc/salt/minion'
- - 'echo "master: 172.16.10.100" >> /etc/salt/minion'
-
- - echo "Restarting minion service with workarounds..."
- - rm -f /etc/salt/pki/minion/minion_master.pub
- - service salt-minion restart
- - sleep 5
- - rm -f /etc/salt/pki/minion/minion_master.pub
- - service salt-minion restart
-
- #- echo "Showing node metadata..."
- #- salt-call pillar.data
-
- #- echo "Running complete state ..."
- #- salt-call state.sls linux,openssh,salt
-
- ########################################################
- # Node is ready, allow SSH access
- - echo "Allow SSH access ..."
- - sudo iptables -D INPUT -p tcp --dport 22 -j DROP
- ########################################################
-
- write_files:
- - path: /etc/network/interfaces.d/99-tcp-tests.cfg
- content: |
- auto eth0
- iface eth0 inet dhcp
- auto eth1
- iface eth1 inet dhcp
diff --git a/tcp_tests/templates/underlay/mk22-lab-basic--user-data1404.yaml b/tcp_tests/templates/underlay/mk22-lab-basic--user-data1404.yaml
index b28d428..be4cc49 100644
--- a/tcp_tests/templates/underlay/mk22-lab-basic--user-data1404.yaml
+++ b/tcp_tests/templates/underlay/mk22-lab-basic--user-data1404.yaml
@@ -34,12 +34,19 @@
#- sudo route add default gw {gateway} {interface_name}
- sudo ifup eth1
+ # Create swap
+ - fallocate -l 4G /swapfile
+ - chmod 600 /swapfile
+ - mkswap /swapfile
+ - swapon /swapfile
+ - echo "/swapfile none swap defaults 0 0" >> /etc/fstab
+
############## TCP Cloud cfg01 node ##################
#- sleep 120
- echo "Preparing base OS"
- which wget >/dev/null || (apt-get update; apt-get install -y wget)
- - echo "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ trusty main security extra tcp tcp-salt" > /etc/apt/sources.list
+ - echo "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ trusty main security tcp tcp-salt" > /etc/apt/sources.list
- wget -O - http://apt.tcpcloud.eu/public.gpg | apt-key add -
# saltstack repo is for minions that have the same version in the xenial and trusty (2016.3.3)
- echo "deb http://repo.saltstack.com/apt/ubuntu/14.04/amd64/latest trusty main" > /etc/apt/sources.list.d/saltstack.list
diff --git a/tcp_tests/templates/underlay/mk22-lab-basic--user-data1604.yaml b/tcp_tests/templates/underlay/mk22-lab-basic--user-data1604.yaml
index a56061d..4ec3a67 100644
--- a/tcp_tests/templates/underlay/mk22-lab-basic--user-data1604.yaml
+++ b/tcp_tests/templates/underlay/mk22-lab-basic--user-data1604.yaml
@@ -34,13 +34,23 @@
#- sudo route add default gw {gateway} {interface_name}
- sudo ifup ens4
+ # Create swap
+ - fallocate -l 4G /swapfile
+ - chmod 600 /swapfile
+ - mkswap /swapfile
+ - swapon /swapfile
+ - echo "/swapfile none swap defaults 0 0" >> /etc/fstab
+
############## TCP Cloud cfg01 node ##################
#- sleep 120
- echo "Preparing base OS"
- which wget >/dev/null || (apt-get update; apt-get install -y wget)
- - echo "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ xenial main security extra tcp tcp-salt" > /etc/apt/sources.list
+ - echo "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ xenial main security tcp tcp-salt" > /etc/apt/sources.list
- wget -O - http://apt.tcpcloud.eu/public.gpg | apt-key add -
+ # saltstack repo is for minions that have the same version in the xenial and trusty (2016.3.3)
+ - echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest xenial main" > /etc/apt/sources.list.d/saltstack.list
+ - wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub | apt-key add -
- apt-get clean
- apt-get update
diff --git a/tcp_tests/templates/underlay/mk22-lab-basic.yaml b/tcp_tests/templates/underlay/mk22-lab-basic.yaml
index f81b4ad..ec02ae6 100644
--- a/tcp_tests/templates/underlay/mk22-lab-basic.yaml
+++ b/tcp_tests/templates/underlay/mk22-lab-basic.yaml
@@ -87,7 +87,7 @@
role: salt_master
params:
vcpu: !os_env SLAVE_NODE_CPU, 4
- memory: !os_env SLAVE_NODE_MEMORY, 8192
+ memory: !os_env SLAVE_NODE_MEMORY, 2048
boot:
- hd
cloud_init_volume_name: iso
@@ -125,7 +125,7 @@
role: salt_minion
params:
vcpu: !os_env SLAVE_NODE_CPU, 4
- memory: !os_env SLAVE_NODE_MEMORY, 12400
+ memory: !os_env SLAVE_NODE_MEMORY, 8192
boot:
- hd
cloud_init_volume_name: iso
@@ -163,7 +163,7 @@
role: salt_minion
params:
vcpu: !os_env SLAVE_NODE_CPU, 4
- memory: !os_env SLAVE_NODE_MEMORY, 12400
+ memory: !os_env SLAVE_NODE_MEMORY, 8192
boot:
- hd
cloud_init_volume_name: iso
@@ -189,7 +189,7 @@
role: salt_minion
params:
vcpu: !os_env SLAVE_NODE_CPU, 4
- memory: !os_env SLAVE_NODE_MEMORY, 12400
+ memory: !os_env SLAVE_NODE_MEMORY, 8192
boot:
- hd
cloud_init_volume_name: iso
@@ -215,7 +215,7 @@
role: salt_minion
params:
vcpu: !os_env SLAVE_NODE_CPU, 4
- memory: !os_env SLAVE_NODE_MEMORY, 8192
+ memory: !os_env SLAVE_NODE_MEMORY, 4096
boot:
- hd
cloud_init_volume_name: iso