Merge "Add opencontrail_node_role parameter for contrail nodes"
diff --git a/opencontrail/control/analytics.yml b/opencontrail/control/analytics.yml
index 6e56936..36781c2 100644
--- a/opencontrail/control/analytics.yml
+++ b/opencontrail/control/analytics.yml
@@ -33,6 +33,7 @@
network:
host: ${_param:opencontrail_control_address}
collector:
+ role: ${_param:opencontrail_node_role}
discovery:
host: ${_param:opencontrail_control_address}
database:
diff --git a/opencontrail/control/analytics4_0.yml b/opencontrail/control/analytics4_0.yml
index bfdbadb..f0cf352 100644
--- a/opencontrail/control/analytics4_0.yml
+++ b/opencontrail/control/analytics4_0.yml
@@ -39,6 +39,7 @@
network:
host: ${_param:openstack_control_address}
collector:
+ role: ${_param:opencontrail_node_role}
config_only: true
discovery:
host: None
diff --git a/opencontrail/control/control.yml b/opencontrail/control/control.yml
index e846f5d..4719dff 100644
--- a/opencontrail/control/control.yml
+++ b/opencontrail/control/control.yml
@@ -30,6 +30,8 @@
identity:
region: ${_param:openstack_region}
host: ${_param:openstack_control_address}
+ control:
+ role: ${_param:opencontrail_node_role}
web:
analytics:
host: ${_param:opencontrail_analytics_address}
diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
index 8572553..09b1e12 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -47,6 +47,7 @@
region: ${_param:openstack_region}
host: ${_param:openstack_control_address}
control:
+ role: ${_param:opencontrail_node_role}
config_only: true
analytics:
members:
diff --git a/reclass/storage/system/opencontrail_analytics_cluster.yml b/reclass/storage/system/opencontrail_analytics_cluster.yml
index 400853e..1027904 100644
--- a/reclass/storage/system/opencontrail_analytics_cluster.yml
+++ b/reclass/storage/system/opencontrail_analytics_cluster.yml
@@ -18,6 +18,7 @@
single_address: ${_param:opencontrail_analytics_node01_address}
keepalived_vip_priority: 103
opencontrail_database_id: 1
+ opencontrail_node_role: primary
opencontrail_analytics_node02:
name: ${_param:opencontrail_analytics_node02_hostname}
domain: ${_param:cluster_domain}
@@ -29,6 +30,7 @@
single_address: ${_param:opencontrail_analytics_node02_address}
keepalived_vip_priority: 102
opencontrail_database_id: 2
+ opencontrail_node_role: secondary
opencontrail_analytics_node03:
name: ${_param:opencontrail_analytics_node03_hostname}
domain: ${_param:cluster_domain}
@@ -40,3 +42,4 @@
single_address: ${_param:opencontrail_analytics_node03_address}
keepalived_vip_priority: 101
opencontrail_database_id: 3
+ opencontrail_node_role: secondary
diff --git a/reclass/storage/system/opencontrail_control_cluster.yml b/reclass/storage/system/opencontrail_control_cluster.yml
index f752c83..64214e1 100644
--- a/reclass/storage/system/opencontrail_control_cluster.yml
+++ b/reclass/storage/system/opencontrail_control_cluster.yml
@@ -18,6 +18,7 @@
single_address: ${_param:opencontrail_control_node01_address}
keepalived_vip_priority: 103
opencontrail_database_id: 1
+ opencontrail_node_role: primary
opencontrail_control_node02:
name: ${_param:opencontrail_control_node02_hostname}
domain: ${_param:cluster_domain}
@@ -29,6 +30,7 @@
single_address: ${_param:opencontrail_control_node02_address}
keepalived_vip_priority: 102
opencontrail_database_id: 2
+ opencontrail_node_role: secondary
opencontrail_control_node03:
name: ${_param:opencontrail_control_node03_hostname}
domain: ${_param:cluster_domain}
@@ -40,3 +42,4 @@
single_address: ${_param:opencontrail_control_node03_address}
keepalived_vip_priority: 101
opencontrail_database_id: 3
+ opencontrail_node_role: secondary
diff --git a/reclass/storage/system/opencontrail_gateway_single.yml b/reclass/storage/system/opencontrail_gateway_single.yml
index 30c7043..a545465 100644
--- a/reclass/storage/system/opencontrail_gateway_single.yml
+++ b/reclass/storage/system/opencontrail_gateway_single.yml
@@ -14,3 +14,4 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:opencontrail_gateway_system_codename}
single_address: ${_param:opencontrail_gateway_address}
+ opencontrail_node_role: primary
\ No newline at end of file
diff --git a/reclass/storage/system/opencontrail_tor_cluster.yml b/reclass/storage/system/opencontrail_tor_cluster.yml
index 1fa2ad0..513b83f 100644
--- a/reclass/storage/system/opencontrail_tor_cluster.yml
+++ b/reclass/storage/system/opencontrail_tor_cluster.yml
@@ -19,6 +19,7 @@
single_address: ${_param:opencontrail_tor01_node01_address}
tenant_address: ${_param:opencontrail_tor01_node01_tenant_address}
keepalived_vip_priority: 103
+ opencontrail_node_role: primary
opencontrail_tor01_node02:
name: ${_param:opencontrail_tor01_node02_hostname}
domain: ${_param:cluster_domain}
@@ -30,3 +31,4 @@
single_address: ${_param:opencontrail_tor01_node02_address}
tenant_address: ${_param:opencontrail_tor01_node02_tenant_address}
keepalived_vip_priority: 102
+ opencontrail_node_role: secondary