Fix duplicate node and missing nodes in sl_os_contrail model
Change-Id: I865fbe9eb3f88f974b0db591876cc27b2a7d14a6
diff --git a/classes/cluster/sl_os_contrail/infra/config.yml b/classes/cluster/sl_os_contrail/infra/config.yml
index 8d5a4ae..158516a 100755
--- a/classes/cluster/sl_os_contrail/infra/config.yml
+++ b/classes/cluster/sl_os_contrail/infra/config.yml
@@ -160,20 +160,6 @@
salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
single_address: ${_param:openstack_proxy_node01_address}
- stacklight_monitor_node01:
- name: ${_param:stacklight_monitor_node01_hostname}
- domain: ${_param:cluster_domain}
- classes:
- - service.galera.master.cluster
- - 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:stacklight_monitor_node01_address}
- keepalived_vip_priority: 100
- mysql_cluster_role: master
openstack_control_node01:
name: ${_param:stacklight_monitor_node01_hostname}
domain: ${_param:cluster_domain}
@@ -214,3 +200,12 @@
single_address: ${_param:stacklight_monitor_node03_address}
keepalived_vip_priority: 102
mysql_cluster_role: slave
+ opencontrail_control_node01:
+ params:
+ rabbitmq_cluster_role: master
+ opencontrail_control_node02:
+ params:
+ rabbitmq_cluster_role: slave
+ opencontrail_control_node03:
+ params:
+ rabbitmq_cluster_role: slave
\ No newline at end of file