commit 76f6546e8ccb57c132ccb75a52f135f2d02d62c4
author Dennis Dmitriev <dis.xcom@gmail.com> Thu Jul 20 16:21:26 2017 -0400
committer Dennis Dmitriev <dis.xcom@gmail.com> Thu Jul 20 16:22:27 2017 -0400
tree 1f303d77e16f58d80b72ea7579f44dc443f1346e
parent 80f49c85e7fff821d0c26461ead7a88d6b11f288

Revert "Fix missing 'memcached' state for --top with cfg01.virtual-mcp11-aio.local"

This reverts commit 80f49c85e7fff821d0c26461ead7a88d6b11f288.

Change-Id: I26c90415cbdcfa00ae839185ad659b188e19d8e5
Reviewed-on: https://review.gerrithub.io/370571
Reviewed-by: Dennis Dmitriev <dis.xcom@gmail.com>
Tested-by: Dennis Dmitriev <dis.xcom@gmail.com>

tcp_tests/templates/virtual-mcp-ocata-dvr/salt.yaml

diff --git a/tcp_tests/templates/virtual-mcp-ocata-dvr/salt.yaml b/tcp_tests/templates/virtual-mcp-ocata-dvr/salt.yaml
index 33073cb..66d9a85 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-dvr/salt.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-dvr/salt.yaml
@@ -140,7 +140,7 @@
     wget -O - "${FORMULA_GPG}" | apt-key add -;
     apt-get clean; apt-get update;
     [ ! -d /srv/salt/reclass/classes/service ] && mkdir -p /srv/salt/reclass/classes/service;
-    declare -a formula_services=("linux" "reclass" "salt" "openssh" "ntp" "git" "nginx" "collectd" "sensu" "heka" "sphinx" "keystone" "mysql" "memcached" "grafana" "haproxy" "rsyslog" "horizon" "prometheus" "telegraf" "elasticsearch" "powerdns");
+    declare -a formula_services=("linux" "reclass" "salt" "openssh" "ntp" "git" "nginx" "collectd" "sensu" "heka" "sphinx" "keystone" "mysql" "grafana" "haproxy" "rsyslog" "horizon" "prometheus" "telegraf" "elasticsearch" "powerdns");
     echo -e "\nInstalling all required salt formulas\n";
     eatmydata apt-get install -y "${formula_services[@]/#/salt-formula-}";
     for formula_service in "${formula_services[@]}"; do