commit 009a1f3a8e0ec9e2fb7ceabae55516a2bb89bc2f
author Victor Ryzhenkin <vryzhenkin@mirantis.com> Fri Apr 06 15:39:27 2018 +0400
committer Victor Ryzhenkin <vryzhenkin@mirantis.com> Fri Apr 13 20:05:27 2018 +0400
tree 5cd58c9cccb3a2bb6b1f88f2e9e7b9b9bd145a31
parent 9feff0a55680afab50819021e8f0debe3416f3c4

Update virtual-mcp11-k8s-contrail

- Updated k8s part
- Minor updates for contrail part

Change-Id: Iad8cd491dcb33bd1fc03d05389ed0d3a848ef600
Related-PROD: PROD-18983

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 b5a73b2..9b30986 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
@@ -1,31 +1,10 @@
-classes:
-- system.linux.system.single
-- system.linux.system.single.debian
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- system.linux.system.repo.mcp.apt_mirantis.fluentd
-- system.linux.system.repo.mcp.apt_mirantis.openstack
-- system.openssh.server.team.all
-- system.rsyslog.client.single
-- system.fluentd
-- system.fluentd.label.default_metric
-- system.fluentd.label.default_metric.prometheus
-- system.fluentd.label.default_output.elasticsearch
-- system.fluentd.label.default_output.drop_event
-- system.telegraf.agent
-- system.prometheus.collector
-- service.grafana.collector
-- cluster.virtual-mcp11-k8s-contrail.kubernetes
-- cluster.virtual-mcp11-k8s-contrail.opencontrail
-- cluster.virtual-mcp11-k8s-contrail.stacklight
-- cluster.overrides
 parameters:
   _param:
     # infra service addresses
     infra_config_hostname: cfg01
     infra_config_address: 172.16.10.100
     infra_config_deploy_address: 192.168.10.90
+    cluster_public_host: 172.16.10.254
 
     cluster_domain: virtual-mcp11-k8s-contrail.local
     cluster_name: virtual-mcp11-k8s-contrail
@@ -33,6 +12,11 @@
   linux:
     network:
       host:
+        self:
+          address: ${_param:single_address}
+          names:
+          - ${linux:system:name}
+          - ${linux:system:name}.${linux:system:domain}
         cfg01:
           address: ${_param:infra_config_address}
           names: