From 9ded0dbacdaa8789bbe52501414979076bd1866b Mon Sep 17 00:00:00 2001
From: shaofeng_cheng <523675833@qq.com>
Date: Thu, 30 Mar 2017 09:23:10 +0800
Subject: [PATCH] Fix cinder config group in nova.conf

If disable cinder in openstack environment.
Cinder of configuration items do not need to configure in nova.conf

Change-Id: Ie346dfe45f8c2d3fd383095d0c64f8e9421100ff
---
 ansible/roles/nova/templates/nova.conf.j2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
index 3e6de22f64..fdbaeeb654 100644
--- a/ansible/roles/nova/templates/nova.conf.j2
+++ b/ansible/roles/nova/templates/nova.conf.j2
@@ -123,8 +123,10 @@ api_servers = {{ internal_protocol }}://{% if orchestration_engine == 'KUBERNETE
 
 num_retries = {{ groups['glance-api'] | length }}
 
+{% if enable_cinder | bool %}
 [cinder]
 catalog_info = volumev2:cinderv2:internalURL
+{% endif %}
 
 [neutron]
 {% if orchestration_engine == 'KUBERNETES' %}