diff options
author | 2017-07-27 22:37:47 -0400 | |
---|---|---|
committer | 2017-07-28 00:08:23 -0400 | |
commit | d3da23a9e665b25ad81fdcc212863bdc87076fee (patch) | |
tree | a03439288899da0f26f30fd12395a31b36cac212 /utils | |
parent | 638edb3eb22ace17c80852fa0d586f12595e2662 (diff) |
support generating pod.yaml for HA test cases on Apex
JIRA: DOVETAIL-472
Now Dovetail can run on Apex pod.
So it needs to support generating pod.yaml on this installer to
guarantee HA test cases can run successfully.
Change-Id: Idc3d457bf9f56ad2ea68d27921498f3060ec375f
Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'utils')
-rw-r--r-- | utils/create_pod_file.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/utils/create_pod_file.py b/utils/create_pod_file.py index 197e4933c..e2c57d23f 100644 --- a/utils/create_pod_file.py +++ b/utils/create_pod_file.py @@ -49,7 +49,7 @@ def get_with_passwd(): args.user, installer_pwd=args.password) -def create_file(handler): +def create_file(handler, INSTALLER_TYPE): """ Create the yaml file of nodes info. As Yardstick required, node name must be node1, node2, ... and node1 must @@ -62,27 +62,30 @@ def create_file(handler): nodes = handler.nodes node_list = [] index = 1 + user = 'root' + if INSTALLER_TYPE == 'apex': + user = 'heat-admin' for node in nodes: try: if node.roles[0].lower() == "controller": node_info = {'name': "node%s" % index, 'role': node.roles[0], - 'ip': node.ip, 'user': 'root'} + 'ip': node.ip, 'user': user} node_list.append(node_info) index += 1 except Exception: node_info = {'name': node.name, 'role': 'unknown', 'ip': node.ip, - 'user': 'root'} + 'user': user} node_list.append(node_info) for node in nodes: try: if node.roles[0].lower() == "compute": node_info = {'name': "node%s" % index, 'role': node.roles[0], - 'ip': node.ip, 'user': 'root'} + 'ip': node.ip, 'user': user} node_list.append(node_info) index += 1 except Exception: node_info = {'name': node.name, 'role': 'unknown', 'ip': node.ip, - 'user': 'root'} + 'user': user} node_list.append(node_info) if args.INSTALLER_TYPE == 'compass': for item in node_list: @@ -105,7 +108,7 @@ def main(): if not handler: print("Error: failed to get the node's handler.") return 1 - create_file(handler) + create_file(handler, args.INSTALLER_TYPE) if __name__ == '__main__': |