openstack
/
kolla
Code Issues Proposed changes

Update neutron confs and ports 

Cleanup all options in the minimal neutron confs. Remove options where
the default value was specified explicitly. Updated ports and bindings
to be configurable.

Partially-Implements: blueprint update-configs

Change-Id: I420ea1469e7bbe87aca0754cd3507098501f1de5
This commit is contained in:
Sam Yaple 2015-08-10 03:38:34 +00:00
parent 0f2c67d929
commit b27163411f
5 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/neutron/templates/dhcp_agent.ini.j2
View File

@ -1,4 +1,3 @@
# dhcp_agent.ini
[DEFAULT]
dnsmasq_config_file = /etc/neutron/dnsmasq.conf
dhcp_delete_namespaces = true

2
ansible/roles/neutron/templates/l3_agent.ini.j2
View File

@ -1,6 +1,4 @@
# l3_agent.ini
[DEFAULT]
router_delete_namespaces = true
enable_metadata_proxy = true
agent_mode = legacy
external_network_bridge =

9
ansible/roles/neutron/templates/metadata_agent.ini.j2
View File

@ -2,12 +2,3 @@
[DEFAULT]
nova_metadata_ip = {{ kolla_internal_address }}
metadata_proxy_shared_secret = {{ metadata_secret }}
auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
auth_region = {{ openstack_region_name }}
auth_plugin = password
project_domain_id = default
user_domain_id = default
project_name = service
username = neutron
password = {{ neutron_keystone_password }}

9
ansible/roles/neutron/templates/ml2_conf.ini.j2
View File

@ -11,14 +11,11 @@ mechanism_drivers = linuxbridge,l2population
{% endif %}
[ml2_type_vlan]
#network_vlan_ranges = external:1000:1999
network_vlan_ranges =
[ml2_type_flat]
flat_networks = physnet1
[ml2_type_gre]
tunnel_id_ranges = 1:1000
[ml2_type_vxlan]
vni_ranges = 1:1000
vxlan_group = 239.1.1.1
@ -29,15 +26,13 @@ firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewal
{% elif neutron_plugin_agent == "linuxbridge" %}
firewall_driver = neutron.agent.linux.iptables_firewall.IptablesFirewallDriver
{% endif %}
enable_ipset = true
enable_security_group = true
{% if neutron_plugin_agent == "openvswitch" %}
[agent]
tunnel_types = vxlan
l2_population = true
arp_responder = true
{% if neutron_plugin_agent == "openvswitch" %}
[ovs]
bridge_mappings = physnet1:{{ neutron_bridge_name }}
{% elif neutron_plugin_agent == "linuxbridge" %}

13
ansible/roles/neutron/templates/neutron.conf.j2
View File

@ -4,11 +4,12 @@ verbose = true
debug = true
bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
bind_port = {{ neutron_server_port }}
lock_path = /var/lock/neutron
#lock_path = /var/lock/neutron
api_paste_config = /usr/share/neutron/api-paste.ini
notification_driver = neutron.openstack.common.notifier.rpc_notifier
notification_driver = noop
{% if neutron_plugin_agent == "openvswitch" %}
interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
@ -20,11 +21,6 @@ allow_overlapping_ips = true
core_plugin = ml2
service_plugins = router
nova_url = http://{{ kolla_internal_address }}:{{ nova_api_port }}/v2
notify_nova_on_port_data_changes = True
notify_nova_on_port_status_change = True
[nova]
auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
auth_plugin = password
@ -35,6 +31,9 @@ project_name = service
username = nova
password = {{ nova_keystone_password }}
[oslo_concurrency]
lock_path = /var/lib/neutron/tmp
[oslo_messaging_rabbit]
rabbit_host = {{ kolla_internal_address }}
rabbit_userid = {{ rabbitmq_user }}