summaryrefslogtreecommitdiffstats
path: root/deploy/tempest.py
diff options
context:
space:
mode:
authorzhouya <zhou.ya@zte.com.cn>2017-08-07 19:03:59 +0800
committerzhouya <zhou.ya@zte.com.cn>2017-08-17 10:07:19 +0800
commit031cb00d90db0519f0902e81a602a71ad115020e (patch)
treebb571eda5e06e4f22a6869bd99a6c57b41eef90b /deploy/tempest.py
parentcf379370addba64f090387eed27f8b91ae82e875 (diff)
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>
Diffstat (limited to 'deploy/tempest.py')
-rw-r--r--deploy/tempest.py10
1 files changed, 1 insertions, 9 deletions
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"}