commit b7a85c315989eb5c36a187cd661702e822fa1f36
author Jakub Josef <jjosef@mirantis.com> Fri May 12 11:56:23 2017 +0000
committer Gerrit Code Review <gerrit2@5776b83a74fe> Fri May 12 11:56:23 2017 +0000
tree 1227ddb562f9fe482dbf3e5c66e06310a7c751eb
parent cb78d2bd7be8e42a62525b0b6e675bed2362f89c
parent a84838dbd10b272083758f718156fc6e9f257c5e

Merge "Horizon identity version has to correspond with defined keystone identity endpoints - currently v2.0 by default"

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

diff --git a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
index fe95334..d1e0603 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
@@ -7,6 +7,7 @@
 - system.openssh.server.team.stacklight
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.mcp_qa
+- system.openssh.server.team.k8s_team
 - system.rsyslog.client.single
 - system.telegraf.agent
 - system.prometheus.collector

classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml

diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
index f81e996..634f0f3 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
@@ -1,4 +1,3 @@
-
 classes:
 - system.linux.system.single
 - system.linux.system.repo.mcp.extra
@@ -8,6 +7,7 @@
 - system.openssh.server.team.stacklight
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.mcp_qa
+- system.openssh.server.team.k8s_team
 - system.rsyslog.client.single
 - system.telegraf.agent
 - cluster.virtual-mcp11-k8s-contrail.kubernetes