From 3a5a2675b58bf63a2e8902908fc26ef4254ad425 Mon Sep 17 00:00:00 2001
From: Zhang Hua <joshua.zhang@canonical.com>
Date: Wed, 30 Aug 2017 15:25:42 +0800
Subject: [PATCH] Support rpc_response_timeout and report_interval in
 neutron.conf

A new mitaka neutron.conf template was introduced into the charm
lately, so both rpc_response_timeout and report_interval need to
be set into the template as well.

Change-Id: I7f34227132d5491d34ff517b8842b21ac5b2991c
Partial-Bug: #1685788
---
 templates/mitaka/neutron.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/mitaka/neutron.conf b/templates/mitaka/neutron.conf
index e774f888..49791f44 100644
--- a/templates/mitaka/neutron.conf
+++ b/templates/mitaka/neutron.conf
@@ -11,11 +11,13 @@ core_plugin = {{ core_plugin }}
 network_device_mtu = {{ network_device_mtu }}
 {% endif -%}
 api_workers = {{ workers }}
+rpc_response_timeout = {{ rpc_response_timeout }}
 
 {% include "section-zeromq" %}
 
 [agent]
 root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
+report_interval = {{ report_interval }}
 
 {% include "section-rabbitmq-oslo" %}