diff --git a/classes/cluster/virtual-mcp11-aio-telemetry/.env b/classes/cluster/virtual-mcp11-aio-telemetry/.env
new file mode 100644
index 0000000..4b0236e
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-aio-telemetry/.env
@@ -0,0 +1 @@
+FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq redis apache keystone gnocchi glance nova neutron cinder ceilometer aodh panko heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables)
diff --git a/classes/cluster/virtual-mcp11-aio-telemetry/infra/config.yml b/classes/cluster/virtual-mcp11-aio-telemetry/infra/config.yml
new file mode 100644
index 0000000..5a7314b
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-aio-telemetry/infra/config.yml
@@ -0,0 +1,8 @@
+classes:
+  - cluster.virtual-mcp11-aio-telemetry
+parameters:
+  linux:
+    system:
+      name: cfg01
+      domain: ${_param:cluster_domain}
+      purge_repos: ${_param:linux_system_purge_repos}
diff --git a/classes/cluster/virtual-mcp11-aio-telemetry/init.yml b/classes/cluster/virtual-mcp11-aio-telemetry/init.yml
new file mode 100755
index 0000000..cd75b17
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-aio-telemetry/init.yml
@@ -0,0 +1,12 @@
+classes:
+- cluster.virtual-mcp11-aio.infra.config
+- cluster.virtual-mcp11-aio-telemetry.openstack
+- cluster.overrides
+parameters:
+  _param:
+    cluster_domain: virtual-mcp11-aio-telemetry.local
+    cluster_name: virtual-mcp11-aio-telemetry
+    reclass_config_master: 192.168.10.90
+    single_address: 172.16.10.90
+    infra_config_address: ${_param:single_address}
+    infra_config_hostname: cfg01
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml b/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
new file mode 100755
index 0000000..100606d
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
@@ -0,0 +1,87 @@
+classes:
+- system.apache.server.site.gnocchi
+- system.apache.server.site.panko
+- system.galera.server.database.gnocchi
+- system.galera.server.database.aodh
+- system.galera.server.database.panko
+- system.keystone.client.service.aodh
+- system.keystone.client.service.panko
+- system.keystone.client.service.ceilometer
+- system.keystone.client.service.gnocchi
+- system.aodh.server.single
+- system.ceilometer.client
+- system.ceilometer.client.cinder_volume
+- system.ceilometer.client.neutron
+- system.ceilometer.client.nova_compute
+- system.gnocchi.common.storage.file
+- system.gnocchi.common.storage.incoming.redis
+- system.gnocchi.server.single
+- system.gnocchi.statsd.single
+- system.gnocchi.common.coordination.redis
+- service.redis.server.single
+- service.panko.server.single
+- service.ceilometer.server.single
+- service.ceilometer.agent.single
+- service.ceilometer.server.publisher.gnocchi
+- service.ceilometer.server.publisher.panko
+parameters:
+  _param:
+    cluster_public_protocol: http
+    panko_version: ${_param:openstack_version}
+    ceilometer_version: ${_param:openstack_version}
+    aodh_version: ${_param:openstack_version}
+    gnocchi_version: 4.0
+    gnocchi_statsd_resource_id: 07f26121-5777-48ba-8a0b-d70468133dd9
+    ceilometer_create_gnocchi_resources: true
+    ceilometer_agent_default_polling_interval: 15
+    ceilometer_agent_default_polling_meters:
+      - "*"
+    ceilometer_secret_key: workshop
+    keystone_aodh_password: workshop
+    keystone_panko_password: workshop
+    keystone_ceilometer_password: workshop
+    keystone_gnocchi_password: workshop
+    mysql_ceilometer_password: workshop
+    mysql_panko_password: workshop
+    mysql_aodh_password: workshop
+    mysql_gnocchi_password: workshop
+    aodh_service_host: ${_param:single_address}
+    ceilometer_service_host: ${_param:single_address}
+    panko_service_host: ${_param:single_address}
+    gnocchi_service_host: ${_param:single_address}
+
+  gnocchi:
+    common:
+      database:
+        ssl:
+          enabled: ${_param:galera_ssl_enabled}
+  aodh:
+    server:
+      database:
+        ssl:
+          enabled: ${_param:galera_ssl_enabled}
+      message_queue:
+        port: ${_param:rabbitmq_port}
+        ssl:
+          enabled: ${_param:rabbitmq_ssl_enabled}
+  ceilometer:
+    server:
+      database: ~
+      message_queue:
+        port: ${_param:rabbitmq_port}
+        ssl:
+          enabled: ${_param:rabbitmq_ssl_enabled}
+      publisher:
+        default:
+          enabled: false
+    agent:
+      polling:
+        sources:
+          default_pollsters:
+            meters: ${_param:ceilometer_agent_default_polling_meters}
+            interval: ${_param:ceilometer_agent_default_polling_interval}
+  panko:
+    server:
+      database:
+        ssl:
+          enabled: ${_param:galera_ssl_enabled}
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index 3ae4807..fdd783f 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -286,6 +286,8 @@
           enabled: ${_param:rabbitmq_ssl_enabled}
   runtest:
     enabled: True
+    salttest:
+      enabled: True
     tempest:
       enabled: True
       cfg_dir: ${_param:runtest_tempest_cfg_dir}
diff --git a/classes/system b/classes/system
index 4891217..bcc346c 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 4891217841b3cf27f247652b949ef28aa6068b87
+Subproject commit bcc346c18cf2fc614b5e4510b4642b442280b9e0