a8e6824e3a
This patch adds the enable-qos option to the charm. If enable-qos is set then neutron.services.qos.qos_plugin.QoSPlugin is added to service_plugins in neutron.conf locally. The neutron-plugin-api-relation has also been updated to send the enable-qos option to charms connected over that relation (for example neutron-openvswitch and neutron-gateway). As part of this some of the logic for setting service_plugins was removed from the neutron.conf and placed in the NeutronCCContext. This patch is based on the steps in: https://docs.openstack.org/mitaka/networking-guide/config-qos.html Change-Id: I1beba9bebdb7766fd95d47bf13b6f4ad86e762b5 Partial-Bug: #1705358
124 lines
3.7 KiB
Plaintext
124 lines
3.7 KiB
Plaintext
# kilo
|
|
###############################################################################
|
|
# [ WARNING ]
|
|
# Configuration file maintained by Juju. Local changes may be overwritten.
|
|
## Restart trigger {{ restart_trigger }}
|
|
###############################################################################
|
|
[DEFAULT]
|
|
verbose = {{ verbose }}
|
|
debug = {{ debug }}
|
|
use_syslog = {{ use_syslog }}
|
|
state_path = /var/lib/neutron
|
|
bind_host = {{ bind_host }}
|
|
auth_strategy = keystone
|
|
notification_driver = messaging
|
|
api_workers = {{ workers }}
|
|
rpc_workers = {{ workers }}
|
|
|
|
router_distributed = {{ enable_dvr }}
|
|
|
|
l3_ha = {{ l3_ha }}
|
|
{% if l3_ha -%}
|
|
max_l3_agents_per_router = {{ max_l3_agents_per_router }}
|
|
min_l3_agents_per_router = {{ min_l3_agents_per_router }}
|
|
{% endif -%}
|
|
|
|
{% if neutron_bind_port -%}
|
|
bind_port = {{ neutron_bind_port }}
|
|
{% else -%}
|
|
bind_port = 9696
|
|
{% endif -%}
|
|
|
|
{% if core_plugin -%}
|
|
core_plugin = {{ core_plugin }}
|
|
{% if service_plugins -%}
|
|
service_plugins = {{ service_plugins }}
|
|
{% endif -%}
|
|
{% endif -%}
|
|
|
|
{% if neutron_security_groups -%}
|
|
allow_overlapping_ips = True
|
|
{% if neutron_plugin == 'Calico' -%}
|
|
neutron_firewall_driver = neutron.agent.linux.iptables_firewall.IptablesFirewallDriver
|
|
{% else -%}
|
|
neutron_firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
|
|
{% endif -%}
|
|
{% endif -%}
|
|
|
|
{% if neutron_plugin == 'Calico' -%}
|
|
dhcp_agents_per_network = 1000
|
|
{% else -%}
|
|
dhcp_agents_per_network = {{ dhcp_agents_per_network }}
|
|
{% endif -%}
|
|
|
|
notify_nova_on_port_status_changes = True
|
|
notify_nova_on_port_data_changes = True
|
|
nova_url = {{ nova_url }}
|
|
nova_region_name = {{ region }}
|
|
{% if auth_host -%}
|
|
nova_admin_username = {{ admin_user }}
|
|
nova_admin_tenant_id = {{ admin_tenant_id }}
|
|
nova_admin_password = {{ admin_password }}
|
|
nova_admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
|
|
{% endif -%}
|
|
|
|
{% if sections and 'DEFAULT' in sections -%}
|
|
{% for key, value in sections['DEFAULT'] -%}
|
|
{{ key }} = {{ value }}
|
|
{% endfor -%}
|
|
{% endif %}
|
|
|
|
{% if user_config_flags -%}
|
|
{% for key, value in user_config_flags.iteritems() -%}
|
|
{{ key }} = {{ value }}
|
|
{% endfor -%}
|
|
{% endif -%}
|
|
|
|
{% include "section-zeromq" %}
|
|
|
|
[quotas]
|
|
{% if quota_driver -%}
|
|
quota_driver = {{ quota_driver }}
|
|
{% else -%}
|
|
quota_driver = neutron.db.quota_db.DbQuotaDriver
|
|
{% endif -%}
|
|
{% if neutron_security_groups -%}
|
|
quota_items = network,subnet,port,security_group,security_group_rule
|
|
quota_security_group = {{ quota_security_group }}
|
|
quota_security_group_rule = {{ quota_security_group_rule }}
|
|
{% else -%}
|
|
quota_items = network,subnet,port
|
|
{% endif -%}
|
|
quota_network = {{ quota_network }}
|
|
quota_subnet = {{ quota_subnet }}
|
|
quota_port = {{ quota_port }}
|
|
quota_vip = {{ quota_vip }}
|
|
quota_pool = {{ quota_pool }}
|
|
quota_member = {{ quota_member }}
|
|
quota_health_monitors = {{ quota_health_monitors }}
|
|
quota_router = {{ quota_router }}
|
|
quota_floatingip = {{ quota_floatingip }}
|
|
|
|
[agent]
|
|
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
|
|
|
|
{% include "section-keystone-authtoken-legacy" %}
|
|
|
|
{% include "parts/section-database" %}
|
|
|
|
{% include "section-rabbitmq-oslo" %}
|
|
|
|
[service_providers]
|
|
service_provider=VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default
|
|
{% if neutron_plugin and neutron_plugin == 'midonet' -%}
|
|
service_provider = LOADBALANCER:Midonet:midonet.neutron.services.loadbalancer.driver.MidonetLoadbalancerDriver:default
|
|
{% else -%}
|
|
service_provider=LOADBALANCER:Haproxy:neutron_lbaas.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
|
|
service_provider=FIREWALL:Iptables:neutron_fwaas.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver:default
|
|
{% endif -%}
|
|
|
|
[oslo_concurrency]
|
|
lock_path = $state_path/lock
|
|
|
|
{% include "parts/section-nova" %}
|