Merge "Define downstream pause image for k8s"
diff --git a/classes/cluster/ceph-ha/.env b/classes/cluster/ceph-ha/.env
index ba7d5dc..4a34430 100644
--- a/classes/cluster/ceph-ha/.env
+++ b/classes/cluster/ceph-ha/.env
@@ -1,4 +1,4 @@
EXTRA_FORMULAS="barbican linux salt reclass maas memcached openssh ntp sphinx \
grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf \
elasticsearch kibana rundeck devops-portal rsync docker keepalived aptly jenkins \
- gerrit artifactory influxdb horizon nginx collectd heka mysql"
+ gerrit artifactory influxdb horizon nginx collectd heka mysql logrotate"
diff --git a/classes/cluster/drivetrain-ha-clusters/.env b/classes/cluster/drivetrain-ha-clusters/.env
index c5ed6e7..ed55820 100644
--- a/classes/cluster/drivetrain-ha-clusters/.env
+++ b/classes/cluster/drivetrain-ha-clusters/.env
@@ -1,4 +1,4 @@
EXTRA_FORMULAS="java docker linux salt reclass aptly jenkins gerrit \
haproxy keepalived postgresql openssh ntp nginx sphinx mysql \
libvirt rsyslog glusterfs xtrabackup freeipa elasticsearch \
- rundeck devops-portal"
+ rundeck devops-portal logrotate"
diff --git a/classes/cluster/drivetrain-ha-oss/.env b/classes/cluster/drivetrain-ha-oss/.env
index c5ed6e7..ed55820 100644
--- a/classes/cluster/drivetrain-ha-oss/.env
+++ b/classes/cluster/drivetrain-ha-oss/.env
@@ -1,4 +1,4 @@
EXTRA_FORMULAS="java docker linux salt reclass aptly jenkins gerrit \
haproxy keepalived postgresql openssh ntp nginx sphinx mysql \
libvirt rsyslog glusterfs xtrabackup freeipa elasticsearch \
- rundeck devops-portal"
+ rundeck devops-portal logrotate"
diff --git a/classes/cluster/drivetrain-ha/.env b/classes/cluster/drivetrain-ha/.env
index c5ed6e7..ed55820 100644
--- a/classes/cluster/drivetrain-ha/.env
+++ b/classes/cluster/drivetrain-ha/.env
@@ -1,4 +1,4 @@
EXTRA_FORMULAS="java docker linux salt reclass aptly jenkins gerrit \
haproxy keepalived postgresql openssh ntp nginx sphinx mysql \
libvirt rsyslog glusterfs xtrabackup freeipa elasticsearch \
- rundeck devops-portal"
+ rundeck devops-portal logrotate"
diff --git a/classes/cluster/k8s-aio-calico/.env b/classes/cluster/k8s-aio-calico/.env
index 4687819..975735e 100644
--- a/classes/cluster/k8s-aio-calico/.env
+++ b/classes/cluster/k8s-aio-calico/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="ntp rsyslog"
+EXTRA_FORMULAS="ntp rsyslog logrotate"
diff --git a/classes/cluster/k8s-aio-contrail/.env b/classes/cluster/k8s-aio-contrail/.env
index 4687819..975735e 100644
--- a/classes/cluster/k8s-aio-contrail/.env
+++ b/classes/cluster/k8s-aio-contrail/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="ntp rsyslog"
+EXTRA_FORMULAS="ntp rsyslog logrotate"
diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/.env b/classes/cluster/k8s-ha-calico-cloudprovider/.env
index 407e2d1..c633e10 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/.env
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="ntp"
+EXTRA_FORMULAS="ntp logrotate"
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/.env b/classes/cluster/k8s-ha-calico-flannel-virtlet/.env
index 407e2d1..c633e10 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/.env
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="ntp"
+EXTRA_FORMULAS="ntp logrotate"
diff --git a/classes/cluster/k8s-ha-calico-syndic/.env b/classes/cluster/k8s-ha-calico-syndic/.env
index 407e2d1..c633e10 100644
--- a/classes/cluster/k8s-ha-calico-syndic/.env
+++ b/classes/cluster/k8s-ha-calico-syndic/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="ntp"
+EXTRA_FORMULAS="ntp logrotate"
diff --git a/classes/cluster/k8s-ha-calico/.env b/classes/cluster/k8s-ha-calico/.env
index 407e2d1..c633e10 100644
--- a/classes/cluster/k8s-ha-calico/.env
+++ b/classes/cluster/k8s-ha-calico/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="ntp"
+EXTRA_FORMULAS="ntp logrotate"
diff --git a/classes/cluster/k8s-ha-contrail/.env b/classes/cluster/k8s-ha-contrail/.env
index 407e2d1..c633e10 100644
--- a/classes/cluster/k8s-ha-contrail/.env
+++ b/classes/cluster/k8s-ha-contrail/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="ntp"
+EXTRA_FORMULAS="ntp logrotate"
diff --git a/classes/cluster/os-ha-contrail-40/.env b/classes/cluster/os-ha-contrail-40/.env
index 83ae21f..ffe5d4d 100644
--- a/classes/cluster/os-ha-contrail-40/.env
+++ b/classes/cluster/os-ha-contrail-40/.env
@@ -1,4 +1,4 @@
EXTRA_FORMULAS="barbican linux salt reclass maas memcached openssh ntp sphinx \
grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf \
elasticsearch kibana rundeck devops-portal rsync docker keepalived aptly jenkins \
- gerrit artifactory influxdb horizon nginx collectd heka mysql nova opencontrail"
+ gerrit artifactory influxdb horizon nginx collectd heka mysql nova opencontrail logrotate"
diff --git a/classes/cluster/os-ha-contrail/.env b/classes/cluster/os-ha-contrail/.env
index 83ae21f..ffe5d4d 100644
--- a/classes/cluster/os-ha-contrail/.env
+++ b/classes/cluster/os-ha-contrail/.env
@@ -1,4 +1,4 @@
EXTRA_FORMULAS="barbican linux salt reclass maas memcached openssh ntp sphinx \
grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf \
elasticsearch kibana rundeck devops-portal rsync docker keepalived aptly jenkins \
- gerrit artifactory influxdb horizon nginx collectd heka mysql nova opencontrail"
+ gerrit artifactory influxdb horizon nginx collectd heka mysql nova opencontrail logrotate"
diff --git a/classes/cluster/os-ha-ovs-pike/.env b/classes/cluster/os-ha-ovs-pike/.env
index ff12bb9..be4225d 100644
--- a/classes/cluster/os-ha-ovs-pike/.env
+++ b/classes/cluster/os-ha-ovs-pike/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="ntp sphinx nginx memcached horizon neutron runtest artifactory"
+EXTRA_FORMULAS="ntp sphinx nginx memcached horizon neutron runtest artifactory logrotate"
diff --git a/classes/cluster/os-ha-ovs-syndic/.env b/classes/cluster/os-ha-ovs-syndic/.env
index b8847b6..7a39f33 100644
--- a/classes/cluster/os-ha-ovs-syndic/.env
+++ b/classes/cluster/os-ha-ovs-syndic/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="nginx"
+EXTRA_FORMULAS="nginx logrotate"
diff --git a/classes/cluster/os-ha-ovs/.env b/classes/cluster/os-ha-ovs/.env
index fdfff18..85df07b 100644
--- a/classes/cluster/os-ha-ovs/.env
+++ b/classes/cluster/os-ha-ovs/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="ntp sphinx nginx memcached horizon"
+EXTRA_FORMULAS="ntp sphinx nginx memcached horizon logrotate"
diff --git a/classes/cluster/sl-k8s-calico/.env b/classes/cluster/sl-k8s-calico/.env
index 13e6475..147f964 100644
--- a/classes/cluster/sl-k8s-calico/.env
+++ b/classes/cluster/sl-k8s-calico/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(fluentd git grafana linux nginx ntp openssh prometheus reclass rsyslog salt sphinx telegraf backupninja)
+FORMULAS_SALT_MASTER+=(fluentd git grafana linux nginx ntp openssh prometheus reclass rsyslog salt sphinx telegraf backupninja logrotate)
diff --git a/classes/cluster/sl-os-contrail/.env b/classes/cluster/sl-os-contrail/.env
index 49c1ca4..9b33733 100644
--- a/classes/cluster/sl-os-contrail/.env
+++ b/classes/cluster/sl-os-contrail/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="fluentd grafana heka nginx ntp prometheus rsyslog sphinx telegraf"
+EXTRA_FORMULAS="fluentd grafana heka nginx ntp prometheus rsyslog sphinx telegraf logrotate"
diff --git a/classes/cluster/sl-pike-dvr/.env b/classes/cluster/sl-pike-dvr/.env
index 13e6475..147f964 100644
--- a/classes/cluster/sl-pike-dvr/.env
+++ b/classes/cluster/sl-pike-dvr/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(fluentd git grafana linux nginx ntp openssh prometheus reclass rsyslog salt sphinx telegraf backupninja)
+FORMULAS_SALT_MASTER+=(fluentd git grafana linux nginx ntp openssh prometheus reclass rsyslog salt sphinx telegraf backupninja logrotate)
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/.env b/classes/cluster/virtual-mcp-mitaka-dvr/.env
index d2e169a..7146e72 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/.env
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="ntp sphinx nginx heka grafana rsyslog prometheus telegraf memcached collectd fluentd"
+EXTRA_FORMULAS="ntp sphinx nginx heka grafana rsyslog prometheus telegraf memcached collectd fluentd logrotate"
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/compute.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/compute.yml
index 761bea8..7646ca0 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/compute.yml
@@ -10,9 +10,9 @@
- cluster.virtual-mcp-mitaka-ovs-trusty
parameters:
_param:
- primary_interface: ens4
- tenant_interface: ens5
- external_interface: ens6
+ primary_interface: eth1
+ tenant_interface: eth2
+ external_interface: eth3
interface_mtu: 1500
nova:
compute:
@@ -33,7 +33,7 @@
interface:
dhcp_int:
enabled: true
- name: ens3
+ name: eth0
proto: dhcp
type: eth
mtu: ${_param:interface_mtu}
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml
index 7a50acd..bfe22fc 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml
@@ -41,7 +41,7 @@
parameters:
_param:
- keepalived_vip_interface: ens4
+ keepalived_vip_interface: eth1
linux:
system:
package:
@@ -49,7 +49,7 @@
version: latest
network:
interface:
- ens4:
+ eth1:
enabled: true
type: eth
proto: static
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/dashboard.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/dashboard.yml
index 050c6cd..177b577 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/dashboard.yml
@@ -7,7 +7,7 @@
linux:
network:
interface:
- ens4:
+ eth1:
enabled: true
type: eth
proto: static
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/gateway.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/gateway.yml
index 8bc9dfa..0aa1032 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/gateway.yml
@@ -6,9 +6,9 @@
- cluster.virtual-mcp-mitaka-ovs-trusty
parameters:
_param:
- primary_interface: ens4
- tenant_interface: ens5
- external_interface: ens6
+ primary_interface: eth1
+ tenant_interface: eth2
+ external_interface: eth3
interface_mtu: 9000
linux:
network:
@@ -16,7 +16,7 @@
interface:
dhcp_int:
enabled: true
- name: ens3
+ name: eth0
proto: dhcp
type: eth
mtu: ${_param:interface_mtu}
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/server.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/server.yml
index af9f983..2202580 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/server.yml
@@ -35,7 +35,7 @@
kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
keepalived_prometheus_vip_password: 'password'
- keepalived_prometheus_vip_interface: ens4
+ keepalived_prometheus_vip_interface: eth1
cluster_vip_address: ${_param:stacklight_monitor_address}
cluster_local_address: ${_param:single_address}
cluster_elasticsearch_port: 9200
@@ -65,7 +65,7 @@
linux:
network:
interface:
- ens4:
+ eth1:
enabled: true
type: eth
proto: static
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/.env b/classes/cluster/virtual-mcp-mitaka-ovs/.env
index 49c1ca4..9b33733 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/.env
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="fluentd grafana heka nginx ntp prometheus rsyslog sphinx telegraf"
+EXTRA_FORMULAS="fluentd grafana heka nginx ntp prometheus rsyslog sphinx telegraf logrotate"
diff --git a/classes/cluster/virtual-mcp-newton-dvr/.env b/classes/cluster/virtual-mcp-newton-dvr/.env
index d2e169a..7146e72 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/.env
+++ b/classes/cluster/virtual-mcp-newton-dvr/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="ntp sphinx nginx heka grafana rsyslog prometheus telegraf memcached collectd fluentd"
+EXTRA_FORMULAS="ntp sphinx nginx heka grafana rsyslog prometheus telegraf memcached collectd fluentd logrotate"
diff --git a/classes/cluster/virtual-mcp-newton-ovs/.env b/classes/cluster/virtual-mcp-newton-ovs/.env
index 49c1ca4..9b33733 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/.env
+++ b/classes/cluster/virtual-mcp-newton-ovs/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="fluentd grafana heka nginx ntp prometheus rsyslog sphinx telegraf"
+EXTRA_FORMULAS="fluentd grafana heka nginx ntp prometheus rsyslog sphinx telegraf logrotate"
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env
index 11849f2..b054cf5 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env
@@ -1 +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 apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd dogtag barbican)
+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 apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd dogtag barbican logrotate)
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/.env b/classes/cluster/virtual-mcp-pike-dvr-ssl/.env
index 5a8072e..3681e6f 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/.env
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/.env
@@ -1 +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 apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd)
+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 apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd logrotate)
diff --git a/classes/cluster/virtual-mcp-pike-dvr/.env b/classes/cluster/virtual-mcp-pike-dvr/.env
index 13e6475..147f964 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/.env
+++ b/classes/cluster/virtual-mcp-pike-dvr/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(fluentd git grafana linux nginx ntp openssh prometheus reclass rsyslog salt sphinx telegraf backupninja)
+FORMULAS_SALT_MASTER+=(fluentd git grafana linux nginx ntp openssh prometheus reclass rsyslog salt sphinx telegraf backupninja logrotate)
diff --git a/classes/cluster/virtual-mcp-pike-ovs/.env b/classes/cluster/virtual-mcp-pike-ovs/.env
index 13e6475..147f964 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/.env
+++ b/classes/cluster/virtual-mcp-pike-ovs/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(fluentd git grafana linux nginx ntp openssh prometheus reclass rsyslog salt sphinx telegraf backupninja)
+FORMULAS_SALT_MASTER+=(fluentd git grafana linux nginx ntp openssh prometheus reclass rsyslog salt sphinx telegraf backupninja logrotate)
diff --git a/classes/cluster/virtual-mcp11-aio/.env b/classes/cluster/virtual-mcp11-aio/.env
index e138b42..95318c1 100644
--- a/classes/cluster/virtual-mcp11-aio/.env
+++ b/classes/cluster/virtual-mcp11-aio/.env
@@ -1 +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 apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables)
+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 apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables logrotate)
diff --git a/classes/cluster/virtual-mcp11-contrail/.env b/classes/cluster/virtual-mcp11-contrail/.env
index 49c1ca4..9b33733 100644
--- a/classes/cluster/virtual-mcp11-contrail/.env
+++ b/classes/cluster/virtual-mcp11-contrail/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="fluentd grafana heka nginx ntp prometheus rsyslog sphinx telegraf"
+EXTRA_FORMULAS="fluentd grafana heka nginx ntp prometheus rsyslog sphinx telegraf logrotate"
diff --git a/classes/cluster/virtual-mcp11-dvr/.env b/classes/cluster/virtual-mcp11-dvr/.env
index 86d851f..4119a14 100644
--- a/classes/cluster/virtual-mcp11-dvr/.env
+++ b/classes/cluster/virtual-mcp11-dvr/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="ntp sphinx nginx heka grafana rsyslog prometheus telegraf memcached collectd fluentd"
\ No newline at end of file
+EXTRA_FORMULAS="ntp sphinx nginx heka grafana rsyslog prometheus telegraf memcached collectd fluentd logrotate"
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/.env b/classes/cluster/virtual-mcp11-k8s-calico-minimal/.env
index ceab58c..c44940b 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/.env
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="etcd"
+EXTRA_FORMULAS="etcd logrotate"
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/.env b/classes/cluster/virtual-mcp11-k8s-contrail/.env
index 49c1ca4..9b33733 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/.env
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="fluentd grafana heka nginx ntp prometheus rsyslog sphinx telegraf"
+EXTRA_FORMULAS="fluentd grafana heka nginx ntp prometheus rsyslog sphinx telegraf logrotate"
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/.env b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/.env
index 22a903b..72c3383 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/.env
+++ b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(ntp sphinx nginx collectd heka grafana)
+FORMULAS_SALT_MASTER+=(ntp sphinx nginx collectd heka grafana logrotate)
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/.env b/classes/cluster/virtual-mcp11-ovs-ironic/.env
index 22a903b..72c3383 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/.env
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(ntp sphinx nginx collectd heka grafana)
+FORMULAS_SALT_MASTER+=(ntp sphinx nginx collectd heka grafana logrotate)
diff --git a/classes/cluster/virtual-mcp11-ovs/.env b/classes/cluster/virtual-mcp11-ovs/.env
index 047f7b5..745e900 100644
--- a/classes/cluster/virtual-mcp11-ovs/.env
+++ b/classes/cluster/virtual-mcp11-ovs/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="ntp sphinx nginx heka grafana rsyslog prometheus telegraf collectd memcached"
+EXTRA_FORMULAS="ntp sphinx nginx heka grafana rsyslog prometheus telegraf collectd memcached logrotate"
diff --git a/classes/cluster/virtual-offline-ssl/.env b/classes/cluster/virtual-offline-ssl/.env
index 11849f2..b054cf5 100644
--- a/classes/cluster/virtual-offline-ssl/.env
+++ b/classes/cluster/virtual-offline-ssl/.env
@@ -1 +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 apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd dogtag barbican)
+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 apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd dogtag barbican logrotate)