diff --git a/tcp_tests/settings_oslo.py b/tcp_tests/settings_oslo.py
index 6ba5b3c..bde95c4 100644
--- a/tcp_tests/settings_oslo.py
+++ b/tcp_tests/settings_oslo.py
@@ -24,7 +24,15 @@
 
 
 _default_conf = pkg_resources.resource_filename(
-    __name__, 'templates/tcpcloud-default.yaml')
+    __name__, 'templates/underlay/mk22-lab-advanced.yaml')
+
+_default_salt_steps = pkg_resources.resource_filename(
+    __name__, 'templates/salt/mk22-lab-advanced-salt.yaml')
+_default_common_services_steps = pkg_resources.resource_filename(
+    __name__,
+    'templates/common-services/mk22-lab-advanced-common-services.yaml')
+_default_openstack_steps = pkg_resources.resource_filename(
+    __name__, 'templates/openstack/mk22-lab-advanced-openstack.yaml')
 
 
 hardware_opts = [
@@ -64,26 +72,36 @@
            help="LVM settings for Underlay", default={}),
 ]
 
-# Deploy options for a new TCPCloud deployment
-tcp_deploy_opts = [
-    ct.Cfg('reclass_settings', ct.JSONDict(),
-           help="", default={}),
+
+salt_deploy_opts = [
+    ct.Cfg('salt_steps_path', ct.String(),
+           help="Path to YAML with steps to deploy salt",
+           default=_default_salt_steps),
 ]
-
-
-# Access credentials to a ready TCP cluster
-tcp_opts = [
-    ct.Cfg('tcp_host', ct.IPAddress(),
+salt_opts = [
+    ct.Cfg('salt_master_host', ct.IPAddress(),
            help="", default='0.0.0.0'),
 ]
 
-
-os_deploy_opts = [
-    # ct.Cfg('stacklight_enable', ct.Boolean(),
-    #        help="", default=False),
+common_services_deploy_opts = [
+    ct.Cfg('common_services_steps_path', ct.String(),
+           help="Path to YAML with steps to deploy common services",
+           default=_default_common_services_steps),
 ]
 
-os_opts = [
+common_services_opts = [
+    ct.Cfg('installed', ct.Boolean(),
+           help="", default=False),
+]
+
+openstack_deploy_opts = [
+    ct.Cfg('openstack_steps_path', ct.String(),
+           help="Path to YAML with steps to deploy openstack",
+           default=_default_openstack_steps),
+]
+openstack_opts = [
+    ct.Cfg('installed', ct.Boolean(),
+           help="", default=False),
     ct.Cfg('keystone_endpoint', ct.String(),
            help="", default=''),
 ]
@@ -92,10 +110,12 @@
 _group_opts = [
     ('hardware', hardware_opts),
     ('underlay', underlay_opts),
-    ('tcp_deploy', tcp_deploy_opts),
-    ('tcp', tcp_opts),
-    ('os_deploy', os_deploy_opts),
-    ('os', os_opts),
+    ('salt_deploy', salt_deploy_opts),
+    ('salt', salt_opts),
+    ('common_services_deploy', common_services_deploy_opts),
+    ('common_services', common_services_opts),
+    ('openstack_deploy', openstack_deploy_opts),
+    ('openstack', openstack_opts),
 ]
 
 
@@ -108,22 +128,34 @@
                           title="Underlay configuration", help=""))
     config.register_opts(group='underlay', opts=underlay_opts)
 
-    config.register_group(cfg.OptGroup(name='tcp_deploy',
-                          title="tcp deploy configuration", help=""))
-    config.register_opts(group='tcp_deploy', opts=tcp_deploy_opts)
+    config.register_group(cfg.OptGroup(name='salt_deploy',
+                          title="salt deploy configuration", help=""))
+    config.register_opts(group='salt_deploy', opts=salt_deploy_opts)
 
-    config.register_group(cfg.OptGroup(name='tcp',
-                          title="tcp config and credentials", help=""))
-    config.register_opts(group='tcp', opts=tcp_opts)
+    config.register_group(cfg.OptGroup(name='salt',
+                          title="salt config and credentials", help=""))
+    config.register_opts(group='salt', opts=salt_opts)
 
-    config.register_group(cfg.OptGroup(name='os',
-                          title="Openstack config and credentials", help=""))
-    config.register_opts(group='os', opts=os_opts)
+    config.register_group(cfg.OptGroup(name='common_services',
+                          title="Common services for Openstack", help=""))
+    config.register_opts(group='common_services', opts=common_services_opts)
+
     config.register_group(
-        cfg.OptGroup(name='os_deploy',
+        cfg.OptGroup(name='common_services_deploy',
+                     title="Common services for Openstack deploy config",
+                     help=""))
+    config.register_opts(group='common_services_deploy',
+                         opts=common_services_deploy_opts)
+
+    config.register_group(cfg.OptGroup(name='openstack',
+                          title="Openstack config and credentials", help=""))
+    config.register_opts(group='openstack', opts=openstack_opts)
+
+    config.register_group(
+        cfg.OptGroup(name='openstack_deploy',
                      title="Openstack deploy config and credentials",
                      help=""))
-    config.register_opts(group='os_deploy', opts=os_deploy_opts)
+    config.register_opts(group='openstack_deploy', opts=openstack_deploy_opts)
     return config
 
 
diff --git a/tcp_tests/templates/underlay/mk22-lab-advanced--user-data-cfg01.yaml.bak b/tcp_tests/templates/underlay/mk22-lab-advanced--user-data-cfg01.yaml.bak
deleted file mode 100644
index ee37d88..0000000
--- a/tcp_tests/templates/underlay/mk22-lab-advanced--user-data-cfg01.yaml.bak
+++ /dev/null
@@ -1,181 +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 ens3
-   #- sudo route add default gw {gateway} {interface_name}
-   - sudo ifup ens4
-
-#   ############## TCP Cloud cfg01 node ##################
-#   - 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
-#   # 'tcp-salt' from trusty is for temporary workaround until formulas will be fixed in xenial
-#   - 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 -
-
-#   - apt-get clean
-#   - apt-get update
-#   - apt-get -y upgrade
-#
-#   # Install common packages
-#   - apt-get install -y python-pip
-#   - apt-get install -y curl tmux byobu iputils-ping traceroute htop tree
-#
-#   - echo "Configuring salt master ..."
-#   - apt-get install -y salt-master reclass
-#   - apt-get install -y salt-formula-*
-#
-#   - |
-#       cat << 'EOF' >> /etc/salt/master.d/master.conf
-#       file_roots:
-#         base:
-#         - /usr/share/salt-formulas/env
-#       pillar_opts: False
-#       open_mode: True
-#       reclass: &reclass
-#         storage_type: yaml_fs
-#         inventory_base_uri: /srv/salt/reclass
-#       ext_pillar:
-#         - reclass: *reclass
-#       master_tops:
-#         reclass: *reclass
-#       EOF
-#
-#   - echo "Configure git settings and certificate"
-#   - touch /root/.git_trusted_certs.pem
-#   - for server in git.tcpcloud.eu github.com; do openssl s_client -showcerts -connect $server:443 </dev/null | openssl x509 -outform PEM >> /root/.git_trusted_certs.pem; done
-#   - HOME=/root git config --global http.sslCAInfo /root/.git_trusted_certs.pem
-#   - HOME=/root git config --global user.email "tcp-qa@example.com"
-#   - HOME=/root git config --global user.name "TCP QA"
-#
-#   - echo "Configuring reclass ..."
-#   - git clone https://github.com/Mirantis/mk-lab-salt-model.git /srv/salt/reclass -b dash
-#   - sed -i 's/ master/ dash/' /srv/salt/reclass/classes/cluster/mk20_lab_advanced/openstack_config.yml
-#   - |
-#       cat << 'EOF' >> /srv/salt/reclass/nodes/control/{hostname}.yml
-#       # local storage
-#         reclass:
-#           storage:
-#             data_source:
-#               engine: local
-#       EOF
-#   - cd /srv/salt/reclass; git add -A;git commit -m"use dash repo"
-
-#   - mkdir -p /srv/salt/reclass/classes/service
-#   - for i in /usr/share/salt-formulas/reclass/service/*; do ln -s $i /srv/salt/reclass/classes/service/; done
-
-#   - '[ ! -d /etc/reclass ] && mkdir /etc/reclass'
-#   - |
-#       cat << 'EOF' >> /etc/reclass/reclass-config.yml
-#       storage_type: yaml_fs
-#       pretty_print: True
-#       output: yaml
-#       inventory_base_uri: /srv/salt/reclass
-#       EOF
-
-#   - echo "Configuring salt minion ..."
-#   - apt-get install -y salt-minion
-#   - '[ ! -d /etc/salt/minion.d ] && mkdir -p /etc/salt/minion.d'
-
-#   - |
-#       cat << "EOF" >> /etc/salt/minion.d/minion.conf
-#       id: {hostname}
-#       master: localhost
-#       EOF
-
-#   - echo "Restarting services with workarounds..."
-#   - service salt-master restart
-#   - sleep 60
-#   - rm -f /etc/salt/pki/minion/minion_master.pub
-#   - service salt-minion restart
-
-#   - echo "Showing system info and metadata ..."
-#   - salt-call --no-color grains.items
-#   - salt-call --no-color pillar.data
-#   - reclass -n {hostname}
-
-   ########################################################
-   # 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 ens3
-          iface ens3 inet dhcp
-          auto ens4
-          iface ens4 inet dhcp
-
-   - path: /root/.ssh/id_rsa
-     owner: root:root
-     permissions: '0600'
-     content: |
-         -----BEGIN RSA PRIVATE KEY-----
-         MIIEpAIBAAKCAQEAxsI1JWJ/VLJlpgBkrhANrCAmne1qsYLCUdBynDG28YtLZ/eo
-         eAqtohmJs5SePHoC5uUeacclpxby+G/9s2/pCkzwjMEXPZ7+8RBqLBBTUBKEg3fo
-         GLtgjtHYEtm1/+5tg15s74aj48VkFF17G9DmAEta/RLOuRRPMuKy2noM/Fd+cXx+
-         OW0wgNFvFUioduuF7Rs9doWnKrLbRP1L8oyU2Xvv11fsSct1gFsXvCfzLltVam6j
-         XsE5qUxPyyVPIuqRuJrFOvsB/fVL7BgDikDnbsp1Bylht1WYOWAo6W21f7f6X1v7
-         xwd2944on0JjYbpcohvwjZ0kOQWobVf+6j7GLQIDAQABAoIBAF0tAAMlmLGY7CQU
-         /R3IctBlRhU1DpZmyTfXc1MbzzqO5Wu44yZbQyjBthcUrdWGEUQy1r4Z2OHq1T54
-         KcPry6DDjuU9Q+rkVXmnC07a3GOmOq7zEEA/3zU01ImJvFNdb8NtCb6ELOKDT7Zo
-         WGUi2h/7M41+OqDzD2m4csYO/3Vvr12sMhn9BfwU4OPpL44A4PJiEryEAw9o5/j/
-         73eyPvgf6tkC4l0mMtfHB9tg/F++iH8fiEr1SMvHGIc9gZNmFYMrs2XfLkAejPfH
-         XrOyw6eqd+kluqw51gHhdeQYwBx6mfOkbhPHWU79FzpH5M1ikdfImZmPCxVf3Ykj
-         nxLoK9UCgYEA4c9agPb/OFyN00nnUMBxzQt1pErpOf/7QhnvNZThomzSV7PyefxF
-         H6G/VlS3gCcrWBCh7mqOSxGcNQwgudVqzUm7QXruQeg4nWcCGSxg7lGYSEf0MyWL
-         5wrd+f9MoV/VV8udIPENjp96o5kwQEVRfsTBNwmk54kup2+br5q8re8CgYEA4VT8
-         UeIN+plP6FjZYITI+SO/ou5goKIhfBrqa5gOXXPc2y6sIu9wBWCr+T7FAF/2gGhS
-         rpVx76zcmx05nwkxIlJh58+G3MVyUDFoWnrtL38vdkBSuOGgNfzcBsFpQvFs8WaW
-         otbuTtkPcXbVdYRr32/C620MxXhUO+svo3CLaaMCgYEA1rjlF8NHl+Gy31rkQg5t
-         aIxgFpVBR+zZkNa2d94V3Ozb65fqmALB/D1Dg6VVROB6P+i5AsyCeHHLd0oMCIof
-         YAyfqrlpvHRE+bAM98ESfyxJwVnipYwrh8z2nZYd2UoWxcCRrtRpjtipts2ha0w/
-         HWudS2e5To5NNdxUT9y1VDMCgYEAxkQiE+ZkyGiXv+hVtLCBqX4EA9fdm9msvudr
-         9qn/kcj9vrntanvlxEWQbCoH61GEsu2YOtdyPiKKpc1sQvwyiHGWhgK7NoxhDiC7
-         IknhYxZ064ajgtu8PWS1MRiDhwypACt1Rej6HNSu2vZl0hZnWF2dU8tLHoHHFEXX
-         T+caNCMCgYBZpD6XBiiEXf0ikXYnXKOmbsyVG80V+yqfLo85qb2RW9TaviOSP43g
-         nB22ReMSHq2cOrs6VTTgfhxefBwzdDFbfKMf6ZU82jCNlpetAZOrhdMHUvcsjSQk
-         XKI6Ldfq6TU3xKujRHfGP+oQ6GLwVCL/kjGxOuSRLFGfRiiqYI3nww==
-         -----END RSA PRIVATE KEY-----
-
-   - path: /root/.ssh/config
-     owner: root:root
-     permissions: '0600'
-     content: |
-          Host *
-            ServerAliveInterval 300
-            ServerAliveCountMax 10
-            StrictHostKeyChecking no
-            UserKnownHostsFile /dev/null
diff --git a/tcp_tests/templates/underlay/mk22-lab-advanced.yaml b/tcp_tests/templates/underlay/mk22-lab-advanced.yaml
index e7195db..350aac0 100644
--- a/tcp_tests/templates/underlay/mk22-lab-advanced.yaml
+++ b/tcp_tests/templates/underlay/mk22-lab-advanced.yaml
@@ -21,7 +21,7 @@
             default_ctl01.mk22-lab-advanced.local: +101
             default_ctl02.mk22-lab-advanced.local: +102
             default_ctl03.mk22-lab-advanced.local: +103
-            default_prx01.mk22-lab-advanced.local: +104
+            default_prx01.mk22-lab-advanced.local: +121
             default_cmp01.mk22-lab-advanced.local: +105
           ip_ranges:
             dhcp: [+100, -2]
@@ -36,7 +36,7 @@
             default_ctl01.mk22-lab-advanced.local: +101
             default_ctl02.mk22-lab-advanced.local: +102
             default_ctl03.mk22-lab-advanced.local: +103
-            default_prx01.mk22-lab-advanced.local: +104
+            default_prx01.mk22-lab-advanced.local: +121
             default_cmp01.mk22-lab-advanced.local: +105
           ip_ranges:
             dhcp: [+100, -2]
diff --git a/tcp_tests/templates/underlay/mk22-lab-advanced.yaml.bak b/tcp_tests/templates/underlay/mk22-lab-advanced.yaml.bak
deleted file mode 100644
index 4c011eb..0000000
--- a/tcp_tests/templates/underlay/mk22-lab-advanced.yaml.bak
+++ /dev/null
@@ -1,254 +0,0 @@
----
-aliases:
-  dynamic_addresses_pool:
-    - &pool_default !os_env POOL_DEFAULT, 172.16.10.0/24:24
-
-  default_interface_model:
-    - &interface_model !os_env INTERFACE_MODEL, virtio
-
-template:
-  devops_settings:
-    env_name: !os_env ENV_NAME, tcpcloud-mk22
-
-    address_pools:
-      public-pool01:
-        net: 172.16.10.0/24:24
-        params:
-          ip_reserved:
-            gateway: +1
-            l2_network_device: +1
-            default_cfg01.mk22-lab-advanced.local: +100
-            default_ctl01.mk22-lab-advanced.local: +101
-            default_ctl02.mk22-lab-advanced.local: +102
-            default_ctl03.mk22-lab-advanced.local: +103
-            default_prx01.mk22-lab-advanced.local: +104
-            default_cmp01.mk22-lab-advanced.local: +105
-          ip_ranges:
-            dhcp: [+100, -2]
-
-      private-pool01:
-        net: 192.168.10.0/24:24
-        params:
-          ip_reserved:
-            gateway: +1
-            l2_network_device: +1
-          ip_ranges:
-            dhcp: [+100, -2]
-
-    groups:
-      - name: default
-        driver:
-          name: devops.driver.libvirt
-          params:
-            connection_string: !os_env CONNECTION_STRING, qemu:///system
-            storage_pool_name: !os_env STORAGE_POOL_NAME, default
-            stp: False
-            hpet: False
-            enable_acpi: true
-            use_host_cpu: !os_env DRIVER_USE_HOST_CPU, true
-
-        network_pools:
-          public: public-pool01
-          private: private-pool01
-
-        l2_network_devices:
-          public:
-            address_pool: public-pool01
-            dhcp: true
-            forward:
-              mode: nat
-
-          private:
-            address_pool: private-pool01
-            dhcp: true
-
-        group_volumes:
-         - name: cloudimage1404    # This name is used for 'backing_store' option for node volumes.
-           source_image: !os_env IMAGE_PATH1404  # https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img or
-                                             # http://apt.tcpcloud.eu/images/ubuntu-14-04-x64-201608231134.qcow2
-           format: qcow2
-         - name: cloudimage1604    # This name is used for 'backing_store' option for node volumes.
-           source_image: !os_env IMAGE_PATH1604  # https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img or
-                                             # http://apt.tcpcloud.eu/images/ubuntu-16-04-x64-201608231004.qcow2
-           format: qcow2
-
-        nodes:
-          - name: cfg01.mk22-lab-advanced.local
-            role: salt_master
-            params:
-              vcpu: !os_env SLAVE_NODE_CPU, 4
-              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
-                  backing_store: cloudimage1604
-                  format: qcow2
-                - name: iso  # Volume with name 'iso' will be used
-                             # for store image with cloud-init metadata.
-                  capacity: 1
-                  format: raw
-                  device: cdrom
-                  bus: ide
-                  cloudinit_meta_data: !include mk22-lab-advanced--meta-data.yaml
-                  cloudinit_user_data: !include mk22-lab-advanced--user-data-cfg01.yaml
-
-              interfaces:
-                - label: ens3
-                  l2_network_device: public
-                  interface_model: *interface_model
-                - label: ens4
-                  l2_network_device: private
-                  interface_model: *interface_model
-              network_config:
-                ens3:
-                  networks:
-                    - public
-                ens4:
-                  networks:
-                    - private
-
-          - name: ctl01.mk22-lab-advanced.local
-            role: salt_minion
-            params:
-              vcpu: !os_env SLAVE_NODE_CPU, 4
-              memory: !os_env SLAVE_NODE_MEMORY, 12400
-              boot:
-                - hd
-              cloud_init_volume_name: iso
-              cloud_init_iface_up: eth0
-              volumes:
-                - name: system
-                  capacity: !os_env NODE_VOLUME_SIZE, 150
-                  backing_store: cloudimage1404
-                  format: qcow2
-                - name: iso  # Volume with name 'iso' will be used
-                             # for store image with cloud-init metadata.
-                  capacity: 1
-                  format: raw
-                  device: cdrom
-                  bus: ide
-                  cloudinit_meta_data: !include mk22-lab-advanced--meta-data.yaml
-                  cloudinit_user_data: !include mk22-lab-advanced--user-data.yaml
-
-              interfaces: &interfaces
-                - label: eth0
-                  l2_network_device: public
-                  interface_model: *interface_model
-                - label: eth1
-                  l2_network_device: private
-                  interface_model: *interface_model
-              network_config: &network_config
-                eth0:
-                  networks:
-                    - public
-                eth1:
-                  networks:
-                    - private
-
-          - name: ctl02.mk22-lab-advanced.local
-            role: salt_minion
-            params:
-              vcpu: !os_env SLAVE_NODE_CPU, 4
-              memory: !os_env SLAVE_NODE_MEMORY, 12400
-              boot:
-                - hd
-              cloud_init_volume_name: iso
-              cloud_init_iface_up: eth0
-              volumes:
-                - name: system
-                  capacity: !os_env NODE_VOLUME_SIZE, 150
-                  backing_store: cloudimage1404
-                  format: qcow2
-                - name: iso  # Volume with name 'iso' will be used
-                             # for store image with cloud-init metadata.
-                  capacity: 1
-                  format: raw
-                  device: cdrom
-                  bus: ide
-                  cloudinit_meta_data: !include mk22-lab-advanced--meta-data.yaml
-                  cloudinit_user_data: !include mk22-lab-advanced--user-data.yaml
-
-              interfaces: *interfaces
-              network_config: *network_config
-
-          - name: ctl03.mk22-lab-advanced.local
-            role: salt_minion
-            params:
-              vcpu: !os_env SLAVE_NODE_CPU, 4
-              memory: !os_env SLAVE_NODE_MEMORY, 12400
-              boot:
-                - hd
-              cloud_init_volume_name: iso
-              cloud_init_iface_up: eth0
-              volumes:
-                - name: system
-                  capacity: !os_env NODE_VOLUME_SIZE, 150
-                  backing_store: cloudimage1404
-                  format: qcow2
-                - name: iso  # Volume with name 'iso' will be used
-                             # for store image with cloud-init metadata.
-                  capacity: 1
-                  format: raw
-                  device: cdrom
-                  bus: ide
-                  cloudinit_meta_data: !include mk22-lab-advanced--meta-data.yaml
-                  cloudinit_user_data: !include mk22-lab-advanced--user-data.yaml
-
-              interfaces: *interfaces
-              network_config: *network_config
-
-          - name: prx01.mk22-lab-advanced.local
-            role: salt_minion
-            params:
-              vcpu: !os_env SLAVE_NODE_CPU, 1
-              memory: !os_env SLAVE_NODE_MEMORY, 2048
-              boot:
-                - hd
-              cloud_init_volume_name: iso
-              cloud_init_iface_up: eth0
-              volumes:
-                - name: system
-                  capacity: !os_env NODE_VOLUME_SIZE, 150
-                  backing_store: cloudimage1404
-                  format: qcow2
-                - name: iso  # Volume with name 'iso' will be used
-                             # for store image with cloud-init metadata.
-                  capacity: 1
-                  format: raw
-                  device: cdrom
-                  bus: ide
-                  cloudinit_meta_data: !include mk22-lab-advanced--meta-data.yaml
-                  cloudinit_user_data: !include mk22-lab-advanced--user-data.yaml
-
-              interfaces: *interfaces
-              network_config: *network_config
-
-          - name: cmp01.mk22-lab-advanced.local
-            role: salt_minion
-            params:
-              vcpu: !os_env SLAVE_NODE_CPU, 4
-              memory: !os_env SLAVE_NODE_MEMORY, 8192
-              boot:
-                - hd
-              cloud_init_volume_name: iso
-              cloud_init_iface_up: eth0
-              volumes:
-                - name: system
-                  capacity: !os_env NODE_VOLUME_SIZE, 150
-                  backing_store: cloudimage1404
-                  format: qcow2
-                - name: iso  # Volume with name 'iso' will be used
-                             # for store image with cloud-init metadata.
-                  capacity: 1
-                  format: raw
-                  device: cdrom
-                  bus: ide
-                  cloudinit_meta_data: !include mk22-lab-advanced--meta-data.yaml
-                  cloudinit_user_data: !include mk22-lab-advanced--user-data.yaml
-
-              interfaces: *interfaces
-              network_config: *network_config