x
/
fuel-ccp-nova
Code Issues Proposed changes

Convert Neutron config to nested 

Change-Id: I518c2f83ad43fe487b577df1f01922788d6a4784
Depends-On: I6cde84fa3acf3a38d2a4323439dc76baf928696f
This commit is contained in:
Yuriy Taraday 2016-10-07 17:23:32 +03:00
parent 31ffaeb48b
commit eb7d5b1070
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
service/files/nova.conf.j2
View File

@ -23,9 +23,9 @@ use_neutron = True
firewall_driver = nova.virt.firewall.NoopFirewallDriver
scheduler_max_attempts = 10
{% if neutron_plugin_agent == "openvswitch" %}
{% if neutron.plugin_agent == "openvswitch" %}
linuxnet_interface_driver = nova.network.linux_net.LinuxOVSInterfaceDriver
{% elif neutron_plugin_agent == "linuxbridge" %}
{% elif neutron.plugin_agent == "linuxbridge" %}
linuxnet_interface_driver = nova.network.linux_net.BridgeInterfaceDriver
{% endif %}
@ -101,7 +101,7 @@ num_retries = 1
catalog_info = volume:cinder:internalURL
[neutron]
url = http://{{ address('neutron-server') }}:{{ neutron_server_port }}
url = http://{{ address('neutron-server') }}:{{ neutron.server_port }}
auth_strategy = keystone
metadata_proxy_shared_secret = {{ nova.metadata.secret }}
service_metadata_proxy = true
@ -111,8 +111,8 @@ auth_plugin = password
project_domain_name = default
user_domain_id = default
project_name = service
username = {{ neutron_db_username }}
password = {{ neutron_db_password }}
username = {{ neutron.db.username }}
password = {{ neutron.db.password }}
[database]
connection = mysql+pymysql://{{ nova.db.username }}:{{ nova.db.password }}@{{ address('mariadb') }}/{{ nova.db.name }}

2
service/files/qemu.conf.j2
View File

@ -1,4 +1,4 @@
{% if neutron_plugin_agent == "calico" %}
{% if neutron.plugin_agent == "calico" %}
clear_emulator_capabilities = 0
cgroup_device_acl = [
"/dev/null", "/dev/full", "/dev/zero",