From 9c739a7190db5b2fa904d5b347df6cf71ae05d4c Mon Sep 17 00:00:00 2001
From: Allen Gao <wanlong.gao@easystack.cn>
Date: Tue, 8 Mar 2016 17:12:21 +0800
Subject: [PATCH] Fix the deprecated security_group_api and network_api_class

The security_group_api option is deprecated since
https://review.openstack.org/#/c/288602 , the security_group_api
will be detected through use_neutron.

TrivialFix

Change-Id: I4e4dd9397b67243ed7268529d9ed0d9b86c846dd
---
 ansible/roles/nova/templates/nova.conf.j2 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
index 4780f963c9..c623b6b6f8 100644
--- a/ansible/roles/nova/templates/nova.conf.j2
+++ b/ansible/roles/nova/templates/nova.conf.j2
@@ -22,8 +22,7 @@ ec2_listen = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']
 ec2_listen_port = {{ nova_api_ec2_port }}
 
 
-security_group_api = neutron
-network_api_class = nova.network.neutronv2.api.API
+use_neutron = True
 firewall_driver = nova.virt.firewall.NoopFirewallDriver
 
 {% if neutron_plugin_agent == "openvswitch" %}