commit b3bf1839d21471191d83998a4b8de54e18e653c6
author Mykyta Karpin <mkarpin@mirantis.com> Tue Mar 06 10:31:40 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Tue Mar 06 10:31:40 2018 +0000
tree 7ea5ddf9f34b082748812646cc350a3aabe2f2f3
parent 6616c61a925c9f0dc6663d862b8220ad0aba4447
parent 60c72beea2e3667ea10660e038cb4899956496e9

Merge "Add AIO telemetry model" into stable/pike

classes/cluster/virtual-mcp11-aio/openstack/init.yml

diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index f6780fb..167d4a4 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -285,6 +285,8 @@
           enabled: ${_param:rabbitmq_ssl_enabled}
   runtest:
     enabled: True
+    salttest:
+      enabled: True
     tempest:
       enabled: True
       cfg_dir: ${_param:runtest_tempest_cfg_dir}

classes/system

diff --git a/classes/system b/classes/system
index 2630214..bcc346c 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 26302147a42fb8a64f3c21b9290f5c37b51ad85d
+Subproject commit bcc346c18cf2fc614b5e4510b4642b442280b9e0