Merge "Remove contrail_discovery from haproxy conf for OC 4.0"
diff --git a/haproxy/proxy/listen/opencontrail/control4_0.yml b/haproxy/proxy/listen/opencontrail/control4_0.yml
new file mode 100644
index 0000000..baeb86e
--- /dev/null
+++ b/haproxy/proxy/listen/opencontrail/control4_0.yml
@@ -0,0 +1,60 @@
+parameters:
+ _param:
+ opencontrail_stats_password: password
+ opencontrail_api_start_offset: 0
+ opencontrail_api_workers_count: 1
+ haproxy:
+ proxy:
+ listen:
+ contrail_api:
+ type: contrail-api
+ service_name: contrail
+ binds:
+ - address: ${_param:cluster_vip_address}
+ port: 8082
+ servers:
+ - name: ntw01
+ host: ${_param:cluster_node01_address}
+ port: 9100
+ params: check inter 2000 rise 2 fall 3
+ port_range_length: ${_param:opencontrail_api_workers_count}
+ port_range_start_offset: ${_param:opencontrail_api_start_offset}
+ - name: ntw02
+ host: ${_param:cluster_node02_address}
+ port: 9100
+ params: check inter 2000 rise 2 fall 3
+ port_range_length: ${_param:opencontrail_api_workers_count}
+ port_range_start_offset: ${_param:opencontrail_api_start_offset}
+ - name: ntw03
+ host: ${_param:cluster_node03_address}
+ port: 9100
+ params: check inter 2000 rise 2 fall 3
+ port_range_length: ${_param:opencontrail_api_workers_count}
+ port_range_start_offset: ${_param:opencontrail_api_start_offset}
+ contrail_config_stats:
+ type: contrail-config
+ check: false
+ format: listen
+ binds:
+ - address: '*'
+ port: 5937
+ user: haproxy
+ password: ${_param:opencontrail_stats_password}
+ contrail_openstack_stats:
+ type: contrail-config
+ check: false
+ format: listen
+ binds:
+ - address: '*'
+ port: 5936
+ user: haproxy
+ password: ${_param:opencontrail_stats_password}
+ contrail_collector_stats:
+ type: contrail-config
+ check: false
+ format: listen
+ binds:
+ - address: '*'
+ port: 5938
+ user: haproxy
+ password: ${_param:opencontrail_stats_password}
diff --git a/opencontrail/control/cluster4_0.yml b/opencontrail/control/cluster4_0.yml
index acd6a0b..381a0d2 100644
--- a/opencontrail/control/cluster4_0.yml
+++ b/opencontrail/control/cluster4_0.yml
@@ -2,7 +2,7 @@
- service.haproxy.proxy.single
- service.keepalived.cluster.single
- service.opencontrail.control.cluster
-- system.haproxy.proxy.listen.opencontrail.control
+- system.haproxy.proxy.listen.opencontrail.control4_0
- system.haproxy.proxy.listen.opencontrail.analytics
parameters:
_param:
diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
index 782e2cb..8572553 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -2,7 +2,7 @@
- service.docker.host
- service.keepalived.cluster.single
- service.opencontrail.control.control
-- system.haproxy.proxy.listen.opencontrail.control
+- system.haproxy.proxy.listen.opencontrail.control4_0
parameters:
_param:
opencontrail_version: 4.0
diff --git a/opencontrail/control/single4_0.yml b/opencontrail/control/single4_0.yml
index 1288af4..779d8d0 100644
--- a/opencontrail/control/single4_0.yml
+++ b/opencontrail/control/single4_0.yml
@@ -45,17 +45,6 @@
host: ${_param:single_address}
port: 9100
params: check inter 2000 rise 2 fall 3
- contrail_discovery:
- type: contrail-api
- service_name: contrail
- binds:
- - address: ${_param:single_address}
- port: 5998
- servers:
- - name: ctl01
- host: ${_param:single_address}
- port: 9110
- params: check inter 2000 rise 2 fall 3
contrail_config_stats:
type: contrail-config
service_name: contrail