From 127d4fceedf73a8b8e61d0f88fb535b1d5a69543 Mon Sep 17 00:00:00 2001
From: Jian Wen <jian.wen@canonical.com>
Date: Wed, 21 Aug 2013 12:41:37 +0800
Subject: [PATCH] enhance description of share_dhcp_address option

It is easier to understand how the option works.

related to bug #1092347.

Change-Id: I843c36c24e82ee26054430e4bd3bdcf4110e4f90
---
 etc/nova/nova.conf.sample | 4 +++-
 nova/network/manager.py   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample
index 8ed3372116..1ff9585a74 100644
--- a/etc/nova/nova.conf.sample
+++ b/etc/nova/nova.conf.sample
@@ -1210,7 +1210,9 @@
 #force_dhcp_release=true
 
 # If True in multi_host mode, all compute hosts share the same
-# dhcp address. (boolean value)
+# dhcp address. The same IP address used for DHCP will be
+# added on each nova-network node which is only visible to the
+# vms on the same host. (boolean value)
 #share_dhcp_address=false
 
 # If True, when a DNS entry must be updated, it sends a fanout
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 33e0c625ca..aad3bb79f3 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -143,7 +143,9 @@ network_opts = [
     cfg.BoolOpt('share_dhcp_address',
                 default=False,
                 help='If True in multi_host mode, all compute hosts share '
-                     'the same dhcp address.'),
+                     'the same dhcp address. The same IP address used for '
+                     'DHCP will be added on each nova-network node which '
+                     'is only visible to the vms on the same host.'),
     cfg.BoolOpt('update_dns_entries',
                 default=False,
                 help='If True, when a DNS entry must be updated, it sends a '