diff options
| author |   zhouya <zhou.ya@zte.com.cn> | 2017-03-14 14:59:35 +0800 |
|---|---|---|
| committer | zhouya <zhou.ya@zte.com.cn> | 2017-03-14 14:59:35 +0800 |
| commit | a46f3e8c4ef7e09deb3d5dc2d1e6969b6375b905 (patch) | |
| tree | 9a7a9b2fcc320989a4fb34912d0395d0c785b3ad /deploy/tempest.py | |
| parent | c557362eb2a14055587feac228a4463bd96f6f4a (diff) | |
modify daisy install interface and modify check_openstack_progress targetnode nums
Change-Id: I19f8c18f8b977619c9bbf6f1e80f7c48f8f5db9e
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
Diffstat (limited to 'deploy/tempest.py')
| -rw-r--r-- | deploy/tempest.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/deploy/tempest.py b/deploy/tempest.py index 2b72cbc2..f01aa77b 100644 --- a/deploy/tempest.py +++ b/deploy/tempest.py @@ -87,7 +87,9 @@ def prepare_install(): add_hosts_interface(cluster_id, hosts_info, hosts_name, host_interface_map, vip) if 'env' in conf and conf['env'] == 0: - build_pxe_for_os(cluster_id) + build_pxe_without_ipmi(cluster_id) + else: + build_pxe_with_ipmi(cluster_id) except Exception: print("Deploy failed!!!.%s." % traceback.format_exc()) else: @@ -100,12 +102,18 @@ def build_pxe_for_discover(cluster_id): client.install.install(**cluster_meta) -def build_pxe_for_os(cluster_id): +def build_pxe_without_ipmi(cluster_id): cluster_meta = {'cluster_id': cluster_id, 'pxe_only': "true"} client.install.install(**cluster_meta) +def build_pxe_with_ipmi(cluster_id): + cluster_meta = {'cluster_id': cluster_id, + 'pxe_only': "false"} + client.install.install(**cluster_meta) + + def discover_host(hosts_name): while True: hosts_info = get_hosts() |