commit a9a065cf138ecf7f97bb2bfbd93e2e6ef50830d2
author Dmitry Kalashnik <dkalashnik@mirantis.com> Thu Mar 29 16:17:58 2018 +0400
committer Dmitry Kalashnik <dkalashnik@mirantis.com> Thu Mar 29 16:38:02 2018 +0400
tree b38fd37d34d35ae3c5d0780ec40bc4c75705e3b3
parent fc31f22f6b638e4ccce40e3946768f081e760d68

Fix fluentd repos for virtual-mcp11-k8s-calico

Change-Id: I2816b2260f713a6b472053732097469b0d2d6d3b
Prod-Related: PROD-18943

classes/cluster/virtual-mcp11-k8s-calico/init.yml

diff --git a/classes/cluster/virtual-mcp11-k8s-calico/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/init.yml
index 66a156f..c75a053 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/init.yml
@@ -5,7 +5,9 @@
 - system.fluentd.label.default_metric.prometheus
 - system.fluentd.label.default_output.elasticsearch
 - system.fluentd.label.default_output.drop_event
-- system.linux.system.repo.fluentd
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.fluentd
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - cluster.virtual-mcp11-k8s-calico.kubernetes
 - cluster.virtual-mcp11-k8s-calico.stacklight
 - cluster.virtual-mcp11-k8s-calico.infra

classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml

diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
index 3910a1a..8f745af 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
@@ -13,6 +13,8 @@
     stacklight_node02_address: 172.16.10.108
     stacklight_node03_address: 172.16.10.109
 
+    openstack_version: pike
+
     # Prometheus
     prometheus_control_address: ${_param:stacklight_monitor_address}
     stacklight_log_address: ${_param:stacklight_monitor_address}