fix OpenContrail 4.0 metadata
Change-Id: I527a5a9cf93af3feec6fdd86a0ef8ba6c296bf9a
diff --git a/opencontrail/control/analytics4_0.yml b/opencontrail/control/analytics4_0.yml
index 1984ee5..a122830 100644
--- a/opencontrail/control/analytics4_0.yml
+++ b/opencontrail/control/analytics4_0.yml
@@ -7,6 +7,10 @@
_param:
opencontrail_version: 4.0
linux_repo_contrail_component: oc40
+ opencontrail_message_queue_node01_address: ${_param:openstack_message_queue_node01_address}
+ opencontrail_message_queue_node02_address: ${_param:openstack_message_queue_node02_address}
+ opencontrail_message_queue_node03_address: ${_param:openstack_message_queue_node03_address}
+ opencontrail_message_queue_address: ${_param:openstack_message_queue_address}
# Temprorary fix for MOS9 packages to pin old version of kafka
linux:
system:
@@ -40,11 +44,11 @@
- host: ${_param:opencontrail_analytics_node02_address}
- host: ${_param:opencontrail_analytics_node03_address}
message_queue:
- host: ${_param:openstack_control_address}
+ host: ${_param:opencontrail_message_queue_address}
members:
- - host: ${_param:openstack_control_node01_address}
- - host: ${_param:openstack_control_node02_address}
- - host: ${_param:openstack_control_node03_address}
+ - host: ${_param:opencontrail_message_queue_node01_address}
+ - host: ${_param:opencontrail_message_queue_node02_address}
+ - host: ${_param:opencontrail_message_queue_node03_address}
config:
members:
- host: ${_param:opencontrail_control_node01_address}
diff --git a/opencontrail/control/cluster4_0.yml b/opencontrail/control/cluster4_0.yml
index 5324fac..cd12eef 100644
--- a/opencontrail/control/cluster4_0.yml
+++ b/opencontrail/control/cluster4_0.yml
@@ -8,6 +8,10 @@
_param:
opencontrail_version: 4.0
linux_repo_contrail_component: oc40
+ opencontrail_message_queue_node01_address: ${_param:openstack_control_node01_address}
+ opencontrail_message_queue_node02_address: ${_param:openstack_control_node02_address}
+ opencontrail_message_queue_node03_address: ${_param:openstack_control_node03_address}
+ opencontrail_message_queue_address: ${_param:openstack_control_address}
# Temprorary fix for MOS9 packages to pin old version of kafka
linux:
system:
@@ -39,11 +43,11 @@
- host: ${_param:cluster_node02_address}
- host: ${_param:cluster_node03_address}
message_queue:
- host: ${_param:openstack_control_address}
+ host: ${_param:opencontrail_message_queue_address}
members:
- - host: ${_param:openstack_control_node01_address}
- - host: ${_param:openstack_control_node02_address}
- - host: ${_param:openstack_control_node03_address}
+ - host: ${_param:opencontrail_message_queue_node01_address}
+ - host: ${_param:opencontrail_message_queue_node02_address}
+ - host: ${_param:opencontrail_message_queue_node03_address}
config:
members:
- host: ${_param:cluster_node01_address}
@@ -64,6 +68,8 @@
address: ${_param:cluster_local_address}
discovery:
host: None
+ api:
+ host: ${_param:opencontrail_control_address}
analytics:
members:
- host: ${_param:cluster_node01_address}
@@ -71,9 +77,9 @@
- host: ${_param:cluster_node03_address}
message_queue:
members:
- - host: ${_param:openstack_message_queue_node01_address}
- - host: ${_param:openstack_message_queue_node02_address}
- - host: ${_param:openstack_message_queue_node03_address}
+ - host: ${_param:opencontrail_message_queue_node01_address}
+ - host: ${_param:opencontrail_message_queue_node02_address}
+ - host: ${_param:opencontrail_message_queue_node03_address}
identity:
region: ${_param:openstack_region}
host: ${_param:openstack_control_address}
@@ -85,9 +91,9 @@
- host: ${_param:cluster_node03_address}
message_queue:
members:
- - host: ${_param:openstack_message_queue_node01_address}
- - host: ${_param:openstack_message_queue_node02_address}
- - host: ${_param:openstack_message_queue_node03_address}
+ - host: ${_param:opencontrail_message_queue_node01_address}
+ - host: ${_param:opencontrail_message_queue_node02_address}
+ - host: ${_param:opencontrail_message_queue_node03_address}
database:
members:
- host: ${_param:cluster_node01_address}
diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
index ae03dea..32b51e5 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -6,6 +6,9 @@
_param:
opencontrail_version: 4.0
linux_repo_contrail_component: oc40
+ opencontrail_message_queue_node01_address: ${_param:openstack_message_queue_node01_address}
+ opencontrail_message_queue_node02_address: ${_param:openstack_message_queue_node02_address}
+ opencontrail_message_queue_node03_address: ${_param:openstack_message_queue_node03_address}
opencontrail:
common:
identity:
@@ -19,6 +22,8 @@
address: ${_param:cluster_local_address}
discovery:
host: None
+ api:
+ host: ${_param:opencontrail_control_address}
analytics:
members:
- host: ${_param:opencontrail_analytics_node01_address}
@@ -26,9 +31,9 @@
- host: ${_param:opencontrail_analytics_node03_address}
message_queue:
members:
- - host: ${_param:openstack_message_queue_node01_address}
- - host: ${_param:openstack_message_queue_node02_address}
- - host: ${_param:openstack_message_queue_node03_address}
+ - host: ${_param:opencontrail_message_queue_node01_address}
+ - host: ${_param:opencontrail_message_queue_node02_address}
+ - host: ${_param:opencontrail_message_queue_node03_address}
identity:
region: ${_param:openstack_region}
host: ${_param:openstack_control_address}
@@ -40,9 +45,9 @@
- host: ${_param:opencontrail_analytics_node03_address}
message_queue:
members:
- - host: ${_param:openstack_message_queue_node01_address}
- - host: ${_param:openstack_message_queue_node02_address}
- - host: ${_param:openstack_message_queue_node03_address}
+ - host: ${_param:opencontrail_message_queue_node01_address}
+ - host: ${_param:opencontrail_message_queue_node02_address}
+ - host: ${_param:opencontrail_message_queue_node03_address}
database:
members:
- host: ${_param:opencontrail_control_node01_address}
diff --git a/opencontrail/control/single4_0.yml b/opencontrail/control/single4_0.yml
index cbd6520..365ed20 100644
--- a/opencontrail/control/single4_0.yml
+++ b/opencontrail/control/single4_0.yml
@@ -84,6 +84,8 @@
address: ${_param:single_address}
discovery:
host: None
+ api:
+ host: ${_param:single_address}
analytics:
members:
- host: ${_param:single_address}