x/fuel-ccp-neutron
Code Issues Proposed changes

Ports configuration refactoring

Browse Source 
Ports configuration has been changed:

before:

  port: 123:3333

after:

  port:
    cont: 123
    node: 3333

Change-Id: I9645e12b686c6d4198889880e0c7b0ca3e64f1f7
Depends-On: I54ab8dd02fc88b821a1f0d05c08f98b618730150
This commit is contained in:
Andrey Pavlov 2016-10-19 18:15:41 +00:00
parent e7bb3cb474
commit 1985b494f2
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
service/files/defaults.yaml
View File

@ -4,7 +4,8 @@ configs:
password: password
name: neutron
username: neutron
server_port: 9696
server_port:
cont: 9696
bridge_name: "br-ex"
external_interface: "eth2"
logging_debug: false

2
service/files/metadata-agent.ini.j2
View File

@ -1,5 +1,5 @@
# metadata_agent.ini
[DEFAULT]
nova_metadata_ip = {{ address('nova-api') }}
nova_metadata_port = {{ nova.metadata.port }}
nova_metadata_port = {{ nova.metadata.port.cont }}
metadata_proxy_shared_secret = {{ nova.metadata.secret }}

2
service/files/ml2_conf.ini.j2
View File

@ -61,5 +61,5 @@ local_ip = {{ network_topology["private"]["address"] }}
{% if neutron.plugin_agent == "calico" %}
[calico]
etcd_host = {{ neutron.calico.etcd_host }}
etcd_port = {{ neutron.calico.etcd_port }}
etcd_port = {{ neutron.calico.etcd_port.cont }}
{% endif %}

12
service/files/neutron.conf.j2
View File

@ -6,7 +6,7 @@ use_stderr = True
use_syslog = False
bind_host = {{ network_topology["private"]["address"] }}
bind_port = {{ neutron.server_port }}
bind_port = {{ neutron.server_port.cont }}
api_paste_config = /usr/share/neutron/api-paste.ini
endpoint_type = internalURL
@ -29,7 +29,7 @@ service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_d
{% endif %}
[nova]
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port }}
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port.cont }}
auth_type = password
project_domain_id = default
user_domain_id = default
@ -48,7 +48,7 @@ rabbit_password = {{ rabbitmq.password }}
rabbit_ha_queues = true
# Here we should have a list of RBMQ servers, but for now 1 is ok
# FIXME
rabbit_hosts = {{ address('rabbitmq') }}:{{ rabbitmq.port }}
rabbit_hosts = {{ address('rabbitmq') }}:{{ rabbitmq.port.cont }}
[agent]
root_helper = sudo neutron-rootwrap /etc/neutron/rootwrap.conf
@ -58,15 +58,15 @@ connection = mysql+pymysql://{{ neutron.db.username }}:{{ neutron.db.password }}
max_retries = -1
[keystone_authtoken]
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port }}
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port }}
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port.cont }}
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = service
username = {{ neutron.db.username }}
password = {{ neutron.db.password }}
memcached_servers = {{ address('memcached') }}:{{ memcached.port }}
memcached_servers = {{ address('memcached') }}:{{ memcached.port.cont }}
[oslo_messaging_notifications]
driver = noop

6
service/neutron-server.yaml
View File

@ -45,17 +45,17 @@ service:
dependencies:
- neutron-service-create
type: single
command: openstack endpoint create --region RegionOne network public http://{{ address('neutron-server') }}:{{ neutron.server_port }}
command: openstack endpoint create --region RegionOne network public http://{{ address('neutron-server') }}:{{ neutron.server_port.cont }}
- name: neutron-internal-endpoint-create
dependencies:
- neutron-service-create
type: single
command: openstack endpoint create --region RegionOne network internal http://{{ address('neutron-server') }}:{{ neutron.server_port }}
command: openstack endpoint create --region RegionOne network internal http://{{ address('neutron-server') }}:{{ neutron.server_port.cont }}
- name: neutron-admin-endpoint-create
dependencies:
- neutron-service-create
type: single
command: openstack endpoint create --region RegionOne network admin http://{{ address('neutron-server') }}:{{ neutron.server_port }}
command: openstack endpoint create --region RegionOne network admin http://{{ address('neutron-server') }}:{{ neutron.server_port.cont }}
daemon:
command: neutron-server --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini
files: