commit 8e1e5d7ce4d254dd0121f5b76b0cf16f2c17f50a
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Mar 13 13:42:57 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Tue Mar 13 13:42:57 2018 +0000
tree 439beb1dc83936f29b9cf4a0ad58aa9a64ea5694
parent 58eee0c178e534bb79b647d475bee477fb1ead71
parent 40180d9b4b451c8ffb43bb5c67d74890fcc3ad1d

Merge "Bump reclass"

classes/cluster/virtual-mcp-pike-dvr/.env

diff --git a/classes/cluster/virtual-mcp-pike-dvr/.env b/classes/cluster/virtual-mcp-pike-dvr/.env
index d2e169a..54bad51 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/.env
+++ b/classes/cluster/virtual-mcp-pike-dvr/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="ntp sphinx nginx heka grafana rsyslog prometheus telegraf memcached collectd fluentd"
+FORMULAS_SALT_MASTER+=(fluentd git grafana linux nginx ntp openssh prometheus reclass rsyslog salt sphinx telegraf)

classes/cluster/virtual-mcp-pike-ovs/.env

diff --git a/classes/cluster/virtual-mcp-pike-ovs/.env b/classes/cluster/virtual-mcp-pike-ovs/.env
new file mode 100644
index 0000000..54bad51
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-ovs/.env
@@ -0,0 +1 @@
+FORMULAS_SALT_MASTER+=(fluentd git grafana linux nginx ntp openssh prometheus reclass rsyslog salt sphinx telegraf)