Merge "[virtual-mcp11-k8s-calico] Apply fixes for routes on k8s computes"
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-calico/kubernetes/compute.yml b/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
index be4d1c7..672f65e 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
@@ -39,6 +39,7 @@
- ${linux:system:name}
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
+ pause_image: ${_param:kubernetes_pause_image}
linux:
network:
resolv:
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/init.yml b/classes/cluster/k8s-aio-calico/kubernetes/init.yml
index 6e46f13..5d9fea7 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/init.yml
@@ -23,8 +23,9 @@
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
- kubernetes_virtlet_image: mirantis/virtlet:v1.0.0
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.13-11
+ kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.8.13-11
+ kubernetes_virtlet_image: mirantis/virtlet:v1.0.2
kubernetes_criproxy_version: v0.10.0
kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
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-aio-contrail/kubernetes/compute.yml b/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
index a5559f4..37a004a 100644
--- a/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
@@ -41,3 +41,4 @@
common:
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
+ pause_image: ${_param:kubernetes_pause_image}
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/init.yml b/classes/cluster/k8s-aio-contrail/kubernetes/init.yml
index fdde5b2..a7122a1 100644
--- a/classes/cluster/k8s-aio-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-aio-contrail/kubernetes/init.yml
@@ -16,7 +16,8 @@
etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
# component docker images
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.13-11
+ kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.8.13-11
kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
kubernetes_externaldns_image: mirantis/external-dns:latest
diff --git a/classes/cluster/k8s-compact/kubernetes/compute.yml b/classes/cluster/k8s-compact/kubernetes/compute.yml
index 4537d07..ca05c62 100644
--- a/classes/cluster/k8s-compact/kubernetes/compute.yml
+++ b/classes/cluster/k8s-compact/kubernetes/compute.yml
@@ -33,6 +33,7 @@
- kube01
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
+ pause_image: ${_param:kubernetes_pause_image}
docker:
host:
pkgs:
diff --git a/classes/cluster/k8s-compact/kubernetes/init.yml b/classes/cluster/k8s-compact/kubernetes/init.yml
index 9e8e135..dae6c1e 100644
--- a/classes/cluster/k8s-compact/kubernetes/init.yml
+++ b/classes/cluster/k8s-compact/kubernetes/init.yml
@@ -32,7 +32,8 @@
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
kubernetes_hyperkube_image: docker-prod-local.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
- kubernetes_virtlet_image: mirantis/virtlet:v1.0.0
+ kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.8.13-11
+ kubernetes_virtlet_image: mirantis/virtlet:v1.0.2
kubernetes_criproxy_version: v0.10.0
kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
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-cloudprovider/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
index bb04c5e..45fabe4 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
@@ -10,7 +10,8 @@
kubernetes_calico_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.13-11
+ kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.8.13-11
docker:
host:
pkgs:
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-flannel-virtlet/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
index 29a179b..7cd2789 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
@@ -46,6 +46,7 @@
- ${_param:kubernetes_compute01_hostname}
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
+ pause_image: ${_param:kubernetes_pause_image}
linux:
network:
resolv:
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
index cd92306..8f71ed4 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
@@ -26,8 +26,9 @@
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
- kubernetes_virtlet_image: mirantis/virtlet:v1.0.0
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.13-11
+ kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.8.13-11
+ kubernetes_virtlet_image: mirantis/virtlet:v1.0.2
kubernetes_criproxy_version: v0.10.0
kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
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-syndic/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
index 7afc253..9897a76 100644
--- a/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
@@ -10,7 +10,8 @@
kubernetes_calico_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.13-11
+ kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.8.13-11
docker:
host:
pkgs:
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-calico/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
index 646db96..8c706d1 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
@@ -40,6 +40,7 @@
- ${_param:kubernetes_compute01_hostname}
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
+ pause_image: ${_param:kubernetes_pause_image}
linux:
network:
resolv:
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/init.yml b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
index 7efad95..977e0e3 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
@@ -26,8 +26,9 @@
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
- kubernetes_virtlet_image: mirantis/virtlet:v1.0.0
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.13-11
+ kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.8.13-11
+ kubernetes_virtlet_image: mirantis/virtlet:v1.0.2
kubernetes_criproxy_version: v0.10.0
kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
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/k8s-ha-contrail/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
index b9d1e74..b093b1a 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
@@ -56,3 +56,4 @@
- ${linux:system:name}
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
+ pause_image: ${_param:kubernetes_pause_image}
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
index 761da5c..bc3a8ea 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
@@ -24,8 +24,9 @@
# component docker images
kubernetes_opencontrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.0.0
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
- kubernetes_virtlet_image: mirantis/virtlet:v1.0.0
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.13-11
+ kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.8.13-11
+ kubernetes_virtlet_image: mirantis/virtlet:v1.0.2
kubernetes_criproxy_version: v0.10.0
kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
@@ -36,7 +37,7 @@
kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
- kubernetes_virtlet_image: mirantis/virtlet:v0.7.0
+ kubernetes_virtlet_image: mirantis/virtlet:v1.0.2
kubernetes_externaldns_image: mirantis/external-dns:latest
kubernetes_externaldns_provider: coredns
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-k8s-calico/kubernetes/compute.yml b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
index c041583..dac84b6 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
@@ -40,6 +40,7 @@
- ${_param:kubernetes_compute_node02_hostname}
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
+ pause_image: ${_param:kubernetes_pause_image}
linux:
network:
resolv:
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/init.yml b/classes/cluster/sl-k8s-calico/kubernetes/init.yml
index 79cccbe..87bc87a 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/init.yml
@@ -27,11 +27,12 @@
kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.13-11
+ kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.8.13-11
kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
- kubernetes_virtlet_image: mirantis/virtlet:v1.0.0
+ kubernetes_virtlet_image: mirantis/virtlet:v1.0.2
kubernetes_criproxy_version: v0.10.0
kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
kubernetes_externaldns_image: mirantis/external-dns:latest
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml b/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml
index c64be9f..03890c1 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml
@@ -37,3 +37,4 @@
common:
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
+ pause_image: ${_param:kubernetes_pause_image}
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/init.yml b/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
index 9479081..5744182 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
@@ -16,7 +16,8 @@
etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
# component docker images
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.13-11
+ kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.8.13-11
kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
kubernetes_externaldns_image: mirantis/external-dns:latest
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/.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-dyn/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
index 2ada67e..b7e8445 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
@@ -26,6 +26,7 @@
common:
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
+ pause_image: ${_param:kubernetes_pause_image}
linux:
network:
resolv:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
index bf525a7..940f7c8 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
@@ -23,7 +23,8 @@
kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.13-11
+ kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.8.13-11
kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
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-calico-minimal/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
index fe6c867..2e76c7d 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
@@ -26,6 +26,7 @@
common:
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
+ pause_image: ${_param:kubernetes_pause_image}
linux:
network:
resolv:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
index e7e5dd8..e9a63a2 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
@@ -22,7 +22,8 @@
kubernetes_calico_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.13-11
+ kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.8.13-11
kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
index e6e0238..5ac9e18 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
@@ -43,6 +43,7 @@
- ${_param:kubernetes_compute_node02_hostname}
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
+ pause_image: ${_param:kubernetes_pause_image}
linux:
network:
resolv:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index d71cc9f..b9f8048 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -25,11 +25,12 @@
kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.13-11
+ kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.8.13-11
kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
- kubernetes_virtlet_image: mirantis/virtlet:v1.0.0
+ kubernetes_virtlet_image: mirantis/virtlet:v1.0.2
kubernetes_criproxy_version: v0.10.0
kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
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-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index 3f1d2c3..f829a49 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -56,3 +56,4 @@
- ${linux:system:name}
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
+ pause_image: ${_param:kubernetes_pause_image}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
index 40af122..4d33801 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -25,7 +25,8 @@
# component docker images
kubernetes_opencontrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.0.0
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.13-11
+ kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.8.13-11
kubernetes_criproxy_version: v0.10.0
kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
@@ -36,7 +37,7 @@
kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
- kubernetes_virtlet_image: mirantis/virtlet:v0.9.4
+ kubernetes_virtlet_image: mirantis/virtlet:v1.0.2
kubernetes_externaldns_image: mirantis/external-dns:latest
kubernetes_externaldns_provider: coredns
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)