Fix templates
This commit is contained in:
parent
5d809b9dba
commit
f531a60ce1
templates
@ -73,8 +73,24 @@ default_floating_pool = {{ external_network }}
|
||||
|
||||
{% if network_manager and network_manager == 'quantum' -%}
|
||||
network_api_class = nova.network.quantumv2.api.API
|
||||
quantum_url = {{ service_protocol }}://{{ service_host }}:{{ service_port }}
|
||||
{% if auth_host -%}
|
||||
quantum_auth_strategy = keystone
|
||||
quantum_admin_tenant_name = {{ admin_tenant_name }}
|
||||
quantum_admin_username = {{ admin_user }}
|
||||
quantum_admin_password = {{ admin_password }}
|
||||
quantum_admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
|
||||
{% endif -%}
|
||||
{% elif network_manager and network_manager == 'neutron' -%}
|
||||
network_api_class = nova.network.neutronv2.api.API
|
||||
neutron_url = {{ service_protocol }}://{{ service_host }}:{{ service_port }}
|
||||
{% if auth_host -%}
|
||||
neutron_auth_strategy = keystone
|
||||
neutron_admin_tenant_name = {{ admin_tenant_name }}
|
||||
neutron_admin_username = {{ admin_user }}
|
||||
neutron_admin_password = {{ admin_password }}
|
||||
neutron_admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
|
||||
{% endif -%}
|
||||
{% else -%}
|
||||
network_manager = nova.network.manager.FlatDHCPManager
|
||||
{% endif -%}
|
||||
|
@ -30,18 +30,6 @@ rabbit_virtual_host = {{ rabbitmq_virtual_host }}
|
||||
{% if neutron_security_groups -%}
|
||||
allow_overlapping_ips = True
|
||||
{% endif -%}
|
||||
{% if neutron_bind_port -%}
|
||||
network_api_class = nova.network.quantumv2.api.API
|
||||
quantum_url = {{ quantum_url }}
|
||||
quantum_auth_strategy = keystone
|
||||
quantum_admin_tenant_name = services
|
||||
quantum_admin_username = {{ service_username }}
|
||||
quantum_admin_password = {{ service_password }}
|
||||
quantum_admin_auth_url = {{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0
|
||||
linuxnet_interface_driver = nova.network.linux_net.LinuxOVSInterfaceDriver
|
||||
firewall_driver = nova.virt.firewall.NoopFirewallDriver
|
||||
security_group_api = quantum
|
||||
{% endif -%}
|
||||
|
||||
[QUOTAS]
|
||||
quota_driver = quantum.db.quota_db.DbQuotaDriver
|
||||
|
@ -26,18 +26,6 @@ rabbit_userid = {{ rabbitmq_user }}
|
||||
rabbit_password = {{ rabbitmq_password }}
|
||||
rabbit_virtual_host = {{ rabbitmq_virtual_host }}
|
||||
{% endif -%}
|
||||
{% if neutron_bind_port -%}
|
||||
network_api_class = nova.network.neutronv2.api.API
|
||||
neutron_url = {{ quantum_url }}
|
||||
neutron_auth_strategy = keystone
|
||||
neutron_admin_tenant_name = services
|
||||
neutron_admin_username = {{ service_username }}
|
||||
neutron_admin_password = {{ service_password }}
|
||||
neutron_admin_auth_url = {{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0
|
||||
linuxnet_interface_driver = nova.network.linux_net.LinuxOVSInterfaceDriver
|
||||
firewall_driver = nova.virt.firewall.NoopFirewallDriver
|
||||
security_group_api = neutron
|
||||
{% endif -%}
|
||||
|
||||
[quotas]
|
||||
quota_driver = neutron.db.quota_db.DbQuotaDriver
|
||||
|
Loading…
x
Reference in New Issue
Block a user