openstack
/
salt-formula-opencontrail
Code Issues Proposed changes

Remove hardcoded ports for contrail API, discovery, anal 

Change-Id: I6cfdcd334dddce9a816be85dba7bec18da9df7f2
Closes-Bug: #1587166
This commit is contained in:
Jakub Pavlik 2016-05-30 21:54:11 +02:00
parent 01fe537d61
commit ee543d4d9f
14 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
metadata/service/control/analytics.yml
View File

@ -23,6 +23,7 @@ parameters:
enabled: true
bind:
address: ${_param:cluster_local_address}
port: 9081
master:
host: ${_param:cluster_local_address}
discovery:

3
metadata/service/control/cluster.yml
View File

@ -32,6 +32,8 @@ parameters:
host: ${_param:cluster_vip_address}
bind:
address: ${_param:cluster_local_address}
api_port: 9100
discovery_port: 9110
message_queue:
engine: rabbitmq
host: ${_param:cluster_vip_address}
@ -84,6 +86,7 @@ parameters:
enabled: true
bind:
address: ${_param:cluster_local_address}
port: 9081
master:
host: ${_param:cluster_local_address}
discovery:

2
metadata/service/control/control.yml
View File

@ -32,6 +32,8 @@ parameters:
host: ${_param:analytics_vip_address}
bind:
address: ${_param:cluster_local_address}
api_port: 9100
discovery_port: 9110
message_queue:
engine: rabbitmq
host: ${_param:cluster_vip_address}

3
metadata/service/control/single.yml
View File

@ -32,6 +32,8 @@ parameters:
host: ${_param:single_address}
bind:
address: ${_param:single_address}
api_port: 9100
discovery_port: 9110
message_queue:
engine: rabbitmq
host: ${_param:single_address}
@ -72,6 +74,7 @@ parameters:
enabled: true
bind:
address: ${_param:single_address}
port: 9081
master:
host: ${_param:single_address}
discovery:

2
opencontrail/files/2.2/config/contrail-api.ini
View File

@ -1,6 +1,6 @@
[program:contrail-api]
command=/usr/bin/contrail-api --conf_file /etc/contrail/contrail-api.conf --conf_file /etc/contrail/contrail-keystone-auth.conf --listen_port 910%(process_num)01d --worker_id %(process_num)s
command=/usr/bin/contrail-api --conf_file /etc/contrail/contrail-api.conf --conf_file /etc/contrail/contrail-keystone-auth.conf --worker_id %(process_num)s
numprocs=1
process_name=%(process_num)s
redirect_stderr=true

2
opencontrail/files/2.2/config/contrail-discovery.ini
View File

@ -1,6 +1,6 @@
[program:contrail-discovery]
command=/usr/bin/contrail-discovery --conf_file /etc/contrail/contrail-discovery.conf --listen_port 911%(process_num)01d --worker_id %(process_num)s
command=/usr/bin/contrail-discovery --conf_file /etc/contrail/contrail-discovery.conf --worker_id %(process_num)s
numprocs=1
process_name=%(process_num)s
redirect_stderr=true

2
opencontrail/files/2.2/contrail-analytics-api.conf
View File

@ -4,7 +4,7 @@ host_ip = {{ collector.bind.address }}
cassandra_server_list={% for member in collector.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}
collectors = {{ collector.bind.address }}:8086
http_server_port = 8090
rest_api_port = 9081
rest_api_port = {{ collector.bind.get('port', '8081') }}
rest_api_ip = 0.0.0.0
log_local = 1
log_level = SYS_NOTICE

2
opencontrail/files/2.2/contrail-api.conf
View File

@ -6,7 +6,7 @@ ifmap_username=api-server
ifmap_password=api-server
cassandra_server_list={% for member in config.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}
listen_ip_addr=0.0.0.0
listen_port=8082
listen_port={{ config.bind.get('api_port', '8082') }}
multi_tenancy=True
log_file=/var/log/contrail/contrail-api.log
log_local=1

2
opencontrail/files/2.2/contrail-discovery.conf
View File

@ -3,7 +3,7 @@
zk_server_ip={% for member in config.database.members %}{{ member.host }}{% if not loop.last %},{% endif %}{% endfor %}
zk_server_port=2181
listen_ip_addr=0.0.0.0
listen_port=5998
listen_port={{ config.bind.get('discovery_port', '5998') }}
log_local=True
log_file=/var/log/contrail/discovery.log
cassandra_server_list={% for member in config.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}

2
opencontrail/files/3.0/config/contrail-api.ini
View File

@ -1,6 +1,6 @@
[program:contrail-api]
command=/usr/bin/contrail-api --conf_file /etc/contrail/contrail-api.conf --conf_file /etc/contrail/contrail-keystone-auth.conf --listen_port 910%(process_num)01d --worker_id %(process_num)s
command=/usr/bin/contrail-api --conf_file /etc/contrail/contrail-api.conf --conf_file /etc/contrail/contrail-keystone-auth.conf --worker_id %(process_num)s
numprocs=1
process_name=%(process_num)s
redirect_stderr=true

2
opencontrail/files/3.0/config/contrail-discovery.ini
View File

@ -1,6 +1,6 @@
[program:contrail-discovery]
command=/usr/bin/contrail-discovery --conf_file /etc/contrail/contrail-discovery.conf --listen_port 911%(process_num)01d --worker_id %(process_num)s
command=/usr/bin/contrail-discovery --conf_file /etc/contrail/contrail-discovery.conf --worker_id %(process_num)s
numprocs=1
process_name=%(process_num)s
redirect_stderr=true

2
opencontrail/files/3.0/contrail-analytics-api.conf
View File

@ -4,7 +4,7 @@ host_ip = {{ collector.bind.address }}
cassandra_server_list={% for member in collector.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}
collectors = {{ collector.bind.address }}:8086
http_server_port = 8090
rest_api_port = 9081
rest_api_port = {{ collector.bind.get('port', '8081') }}
rest_api_ip = 0.0.0.0
log_local = 1
log_level = SYS_NOTICE

4
opencontrail/files/3.0/contrail-api.conf
View File

@ -6,7 +6,7 @@ ifmap_username=api-server
ifmap_password=api-server
cassandra_server_list={% for member in config.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}
listen_ip_addr=0.0.0.0
listen_port=8082
listen_port={{ config.bind.get('api_port', '8082') }}
multi_tenancy={{ config.get('multi_tenancy', 'true')|lower }}
log_file=/var/log/contrail/contrail-api.log
log_local=1
@ -43,4 +43,4 @@ insecure=True
project_name={{ config.identity.tenant }}
auth_url=http://{{ config.identity.host }}:{{ config.identity.port }}/v3
{%- endif %}
{%- endif %}
{%- endif %}

2
opencontrail/files/3.0/contrail-discovery.conf
View File

@ -3,7 +3,7 @@
zk_server_ip={% for member in config.database.members %}{{ member.host }}{% if not loop.last %},{% endif %}{% endfor %}
zk_server_port=2181
listen_ip_addr=0.0.0.0
listen_port=5998
listen_port={{ config.bind.get('discovery_port', '5998') }}
log_local=True
log_file=/var/log/contrail/discovery.log
cassandra_server_list={% for member in config.database.members %}{{ member.host }}:{{ member.port }} {% endfor %}