commit a7a449d858cfd709d45f3f745539ca8c5c42d961
author Simon Pasquier <spasquier@mirantis.com> Thu May 11 10:03:41 2017 +0200
committer Simon Pasquier <spasquier@mirantis.com> Fri May 12 17:02:55 2017 +0200
tree 188caa9ad91bcfee589f3ba328c0bdd045982f2c
parent 3404b566922b175812c91c08e0e6f2a470bef7b9

Merge swarm and monitoring classes (mcp11-k8s-*)

This avoids many problems when overriding parameters in the init
classes.

Change-Id: I71067f26c95e0e3807cd1eb94a6bb735f08df166

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

diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
index 29cc1c5..4077b40 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
@@ -44,44 +44,44 @@
           name: ${_param:kubernetes_proxy_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.monitoring.proxy
+          - cluster.${_param:cluster_name}.stacklight.proxy
           params:
             salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
             single_address: ${_param:kubernetes_proxy_node01_address}
-        docker_swarm_node01:
-          name: ${_param:docker_swarm_node01_hostname}
+        stacklight_node01:
+          name: ${_param:stacklight_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.swarm.master
-          - cluster.${_param:cluster_name}.monitoring.client
-          - cluster.${_param:cluster_name}.monitoring.server
+          - system.docker.swarm.master
+          - cluster.${_param:cluster_name}.stacklight.client
+          - cluster.${_param:cluster_name}.stacklight.server
           params:
             salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
-            single_address: ${_param:docker_swarm_node01_address}
+            single_address: ${_param:stacklight_node01_address}
             keepalived_vip_priority: 100
-        docker_swarm_node02:
-          name: ${_param:docker_swarm_node02_hostname}
+        stacklight_node02:
+          name: ${_param:stacklight_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.swarm.slave
-          - cluster.${_param:cluster_name}.monitoring.server
+          - system.docker.swarm.manager
+          - cluster.${_param:cluster_name}.stacklight.server
           params:
             salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
-            single_address: ${_param:docker_swarm_node02_address}
+            single_address: ${_param:stacklight_node02_address}
             keepalived_vip_priority: 101
-        docker_swarm_node03:
-          name: ${_param:docker_swarm_node03_hostname}
+        stacklight_node03:
+          name: ${_param:stacklight_node03_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.swarm.slave
-          - cluster.${_param:cluster_name}.monitoring.server
+          - system.docker.swarm.manager
+          - cluster.${_param:cluster_name}.stacklight.server
           params:
             salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
-            single_address: ${_param:docker_swarm_node03_address}
+            single_address: ${_param:stacklight_node03_address}
             keepalived_vip_priority: 102
         opencontrail_control_node01:
           params: