Merge "Define Helm parameters for k8s."
diff --git a/maas/region/single.yml b/maas/region/single.yml
index 309ef34..96ba7c6 100644
--- a/maas/region/single.yml
+++ b/maas/region/single.yml
@@ -53,6 +53,10 @@
name: maasdb
password: ${_param:maas_db_password}
username: maas
+ ntp:
+ server_1:
+ enabled: true
+ host: pool.ntp.org
maas_config:
main_archive: ${_param:maas_region_main_archive}
commissioning_distro_series: xenial
diff --git a/opencontrail/control/cluster4_0_k8s.yml b/opencontrail/control/cluster4_0_k8s.yml
index 03ad89c..cf9a8e7 100644
--- a/opencontrail/control/cluster4_0_k8s.yml
+++ b/opencontrail/control/cluster4_0_k8s.yml
@@ -43,6 +43,7 @@
network:
host: ${_param:openstack_control_address}
collector:
+ role: ${_param:opencontrail_node_role}
config_only: true
discovery:
host: None
@@ -98,6 +99,7 @@
region: ${_param:openstack_region}
host: ${_param:openstack_control_address}
control:
+ role: ${_param:opencontrail_node_role}
config_only: true
identity:
host: ${_param:openstack_control_address}
diff --git a/reclass/storage/system/kubernetes_contrail_cluster.yml b/reclass/storage/system/kubernetes_contrail_cluster.yml
index c85f6f0..2a0ba74 100644
--- a/reclass/storage/system/kubernetes_contrail_cluster.yml
+++ b/reclass/storage/system/kubernetes_contrail_cluster.yml
@@ -22,6 +22,7 @@
deploy_address: ${_param:kubernetes_control_node01_deploy_address}
keepalived_vip_priority: 103
opencontrail_database_id: 1
+ opencontrail_node_role: primary
rabbitmq_cluster_role: master
kubernetes_control_node02:
name: ${_param:kubernetes_control_node02_hostname}
@@ -35,6 +36,7 @@
deploy_address: ${_param:kubernetes_control_node02_deploy_address}
keepalived_vip_priority: 102
opencontrail_database_id: 2
+ opencontrail_node_role: secondary
rabbitmq_cluster_role: slave
kubernetes_control_node03:
name: ${_param:kubernetes_control_node03_hostname}
@@ -48,4 +50,5 @@
deploy_address: ${_param:kubernetes_control_node03_deploy_address}
keepalived_vip_priority: 101
opencontrail_database_id: 3
+ opencontrail_node_role: secondary
rabbitmq_cluster_role: slave