Merge "Remove system.designate.server.backend.pdns from control.yml"
diff --git a/classes/cluster/os-ha-ovs/init.yml b/classes/cluster/os-ha-ovs/init.yml
index 7c35891..b3a8f85 100644
--- a/classes/cluster/os-ha-ovs/init.yml
+++ b/classes/cluster/os-ha-ovs/init.yml
@@ -6,4 +6,5 @@
- system.openssh.server.team.lab
- system.openssh.server.team.tcpcloud
- system.openssh.server.team.mcp_qa
+- system.openssh.server.team.services
- cluster.overrides
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
index 18f1369..bbe5de9 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -26,11 +26,9 @@
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.7.5-2
- kubernetes_virtlet_image: mirantis/virtlet:latest
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:v0.7.0
kubernetes_externaldns_image: mirantis/external-dns:latest
kubernetes_externaldns_provider: coredns
@@ -39,6 +37,7 @@
kubernetes_netchecker_enabled: true
kubernetes_calico_policy_enabled: false
kubernetes_virtlet_enabled: false
+ kubernetes_virtlet_image: mirantis/virtlet:latest
kubernetes_coredns_enabled: false
kubernetes_externaldns_enabled: false