From eb7d5b1070f7e5a7fc32edf03bd2c0f4e535aee5 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Fri, 7 Oct 2016 17:23:32 +0300
Subject: [PATCH] Convert Neutron config to nested

Change-Id: I518c2f83ad43fe487b577df1f01922788d6a4784
Depends-On: I6cde84fa3acf3a38d2a4323439dc76baf928696f
---
 service/files/nova.conf.j2 | 10 +++++-----
 service/files/qemu.conf.j2 |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/service/files/nova.conf.j2 b/service/files/nova.conf.j2
index 4cedc96..9c3649e 100644
--- a/service/files/nova.conf.j2
+++ b/service/files/nova.conf.j2
@@ -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 }}
diff --git a/service/files/qemu.conf.j2 b/service/files/qemu.conf.j2
index 7e3b955..8fbd484 100644
--- a/service/files/qemu.conf.j2
+++ b/service/files/qemu.conf.j2
@@ -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",