use daisy.conf to build pxe server

we use the interface of daisyclient to build the pxe server
in tempest.py,but we can use the daisy.conf to build the pxe
server instead,this is just the optimization of code

Change-Id: I7a75d33aa8f80326750d304fa0a881201e956c57
Signed-off-by: zhouya <zhou.ya@zte.com.cn>

4 files changed, 41 insertions, 13 deletions

diff --git a/deploy/daisy.conf b/deploy/daisy.conf
index d9659dbb..fe48925f 100644
--- a/deploy/daisy.conf
+++ b/deploy/daisy.conf
@@ -16,10 +16,10 @@ os_install_type=pxe
 
 [PXE]
 #Set to 'yes' if you want to build a PXE server, otherwise to 'no'.
-build_pxe=no
+build_pxe=yes
 
 #the nic name, to build a PXE server on this nic.
-eth_name=
+eth_name=ens3
 
 #The ip value of PXE server
 ip_address=99.99.1.5
diff --git a/deploy/tempest.py b/deploy/tempest.py
index b154e72d..9117a187 100644
--- a/deploy/tempest.py
+++ b/deploy/tempest.py
@@ -19,7 +19,6 @@ import os
 daisy_version = 1.0
 daisyrc_path = "/root/daisyrc_admin"
 iso_path = "/var/lib/daisy/kolla/"
-deployment_interface = "ens3"
 cluster_name = "clustertest"
 
 _CLI_OPTS = [
@@ -59,6 +58,7 @@ def get_endpoint(file_path):
             daisy_endpoint = daisyrc_admin_line.split("=")[1]
     return daisy_endpoint
 
+
 daisy_endpoint = get_endpoint(daisyrc_path)
 client = daisy_client.Client(version=daisy_version, endpoint=daisy_endpoint)
 
@@ -79,8 +79,6 @@ def prepare_install():
             print("cluster_id=%s." % cluster_id)
             print("update network...")
             update_network(cluster_id, network_map)
-            print("build pxe...")
-            build_pxe_for_discover(cluster_id)
         elif conf['host'] and conf['host'] == 'yes':
             isbare = False if 'isbare' in conf and conf['isbare'] == 0 else True
             print("discover host...")
@@ -127,12 +125,6 @@ def prepare_install():
         print_bar("Everything is done!")
 
 
-def build_pxe_for_discover(cluster_id):
-    cluster_meta = {'cluster_id': cluster_id,
-                    'deployment_interface': deployment_interface}
-    client.install.install(**cluster_meta)
-
-
 def install_os_for_vm_step1(cluster_id):
     cluster_meta = {'cluster_id': cluster_id,
                     'pxe_only': "true"}
diff --git a/docs/release/configguide/installerconfig.rst b/docs/release/configguide/installerconfig.rst
index 795f6028..f6a01b71 100644
--- a/docs/release/configguide/installerconfig.rst
+++ b/docs/release/configguide/installerconfig.rst
@@ -11,5 +11,38 @@ Abstract
 ========
 
 This document compiles the release notes for the D 2.0 release of
-OPNFV when using Daisy4nfv as a deployment tool.
+OPNFV when using Daisy as a deployment tool.
 
+
+Configuration Guide
+===================
+
+Before installing Daisy4NFV on jump server,you have to configure the
+daisy.conf file.Then put the right configured daisy.conf file in the
+/home/daisy_install/ dir.
+
+1. you have to supplement the "daisy_management_ip" field with the ip of
+   management ip of your Daisy server vm.
+
+2. Now the backend field "default_backend_types" just support the "kolla".
+
+3. "os_install_type" field just support "pxe" for now.
+
+4. Daisy now use pxe server to install the os, so "build_pxe" must set to "yes".
+   If the value in daisy.conf in your env of /home/daisy_install/ dir is "no",
+   you must change this field to "yes" manually before installing Daisy.
+
+5. "eth_name" field is the pxe server interface, and this field is required when
+   the "build_pxe" field set to "yes".This should be set to the interface
+   (in Daisy Server VM) which will be used for communicating with other target nodes
+   on management/PXE net plane. Default is ens3.
+
+6. "ip_address" field is the ip address of pxe server interface.
+
+7. "net_mask" field is the netmask of pxe server,which is required when the "build_pxe"
+   is set to "yes"
+
+8. "client_ip_begin" and "client_ip_end" field are the dhcp range of the pxe server.
+
+9. If you want to use the multicast type to deliver the kolla image to target node,
+   set the "daisy_conf_mcast_enabled" field to "True"
diff --git a/docs/release/installation/vmdeploy.rst b/docs/release/installation/vmdeploy.rst
index 3812a40e..5da3949b 100644
--- a/docs/release/installation/vmdeploy.rst
+++ b/docs/release/installation/vmdeploy.rst
@@ -42,7 +42,10 @@ E.g. OpenStack only deployment roles setting
           - compute
 
 NOTE:
-For B/M, Daisy uses MAC address defined in deploy.yml to map discovered nodes to node items definition in deploy.yml, then assign role described by node item to the discovered nodes by name pattern. Currently, controller01, controller02, and controller03 will be assigned with Controler role while computer01, 'computer02, computer03, and computer04 will be assigned with Compute role.
+For B/M, Daisy uses MAC address defined in deploy.yml to map discovered nodes to node items definition in deploy.yml,
+then assign role described by node item to the discovered nodes by name pattern.
+Currently, controller01, controller02, and controller03 will be assigned with Controller role
+while computer01, computer02, computer03, and computer04 will be assigned with Compute role.
 
 NOTE:
 For V/M, There is no MAC address defined in deploy.yml for each virtual machine. Instead, Daisy will fill that blank by getting MAC from "virsh dump-xml".