From 0b5e81541893fc38164922dd8a02e7d75d2e861c Mon Sep 17 00:00:00 2001
From: jichenjc <jichenjc@cn.ibm.com>
Date: Mon, 25 Apr 2016 23:41:55 +0800
Subject: [PATCH] adopt changes of netconf

patch d619ad6ba15df1cf7dc92ddf84d1c65af018682f
Centralize netconf options, we need to adopt those
changes.

Change-Id: I73cb30ac9b16b6cc30fc70fa23dbbd843258d7fb
---
 nova/virt/zvm/driver.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nova/virt/zvm/driver.py b/nova/virt/zvm/driver.py
index d5fa9dc..e9e0371 100644
--- a/nova/virt/zvm/driver.py
+++ b/nova/virt/zvm/driver.py
@@ -184,8 +184,8 @@ CONF = cfg.CONF
 CONF.register_opts(zvm_opts)
 CONF.register_opts(zvm_user_opts)
 CONF.register_opts(zvm_image_opts)
-CONF.import_opt('host', 'nova.netconf')
-CONF.import_opt('my_ip', 'nova.netconf')
+CONF.import_opt('host', 'nova.conf')
+CONF.import_opt('my_ip', 'nova.conf')
 CONF.import_opt('default_ephemeral_format', 'nova.virt.driver')
 
 ZVMInstance = zvminstance.ZVMInstance