Merge "Fix duplicate node and missing nodes in sl_os_contrail model"
diff --git a/classes/cluster/k8s_ha_calico/kubernetes/control.yml b/classes/cluster/k8s_ha_calico/kubernetes/control.yml
index d438c5a..259722f 100644
--- a/classes/cluster/k8s_ha_calico/kubernetes/control.yml
+++ b/classes/cluster/k8s_ha_calico/kubernetes/control.yml
@@ -26,7 +26,7 @@
netchecker:
enabled: true
helm:
- enabled: true
+ enabled: false
master:
etcd:
ssl:
diff --git a/classes/cluster/os_aio_contrail/openstack/init.yml b/classes/cluster/os_aio_contrail/openstack/init.yml
index b3a0672..721257a 100755
--- a/classes/cluster/os_aio_contrail/openstack/init.yml
+++ b/classes/cluster/os_aio_contrail/openstack/init.yml
@@ -96,43 +96,8 @@
linux:
network:
host:
- ctl:
- address: ${_param:openstack_control_address}
- names:
- - ctl
- - ctl.${_param:cluster_domain}
ctl01:
address: ${_param:openstack_control_node01_address}
names:
- ${_param:openstack_control_node01_hostname}
- ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
- msg:
- address: ${_param:openstack_message_queue_address}
- names:
- - msg
- - msg.${_param:cluster_domain}
- msg01:
- address: ${_param:openstack_message_queue_node01_address}
- names:
- - ${_param:openstack_message_queue_node01_hostname}
- - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain}
- dbs:
- address: ${_param:openstack_database_address}
- names:
- - dbs
- - dbs.${_param:cluster_domain}
- dbs01:
- address: ${_param:openstack_database_node01_address}
- names:
- - ${_param:openstack_database_node01_hostname}
- - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain}
- cmp01:
- address: ${_param:openstack_compute_node01_address}
- names:
- - ${_param:openstack_compute_node01_hostname}
- - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
- cmp02:
- address: ${_param:openstack_compute_node02_address}
- names:
- - ${_param:openstack_compute_node02_hostname}
- - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}
diff --git a/classes/system b/classes/system
index dd3848d..9b85a38 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit dd3848d8bd94040044f2c5fa1724640c56195333
+Subproject commit 9b85a38800599124dfe4118d9bb007eee52b6932