Provide default password for daisy server 81/50281/1
authorAlex Yang <yangyang1@zte.com.cn>
Tue, 9 Jan 2018 07:01:46 +0000 (15:01 +0800)
committerAlex Yang <yangyang1@zte.com.cn>
Tue, 9 Jan 2018 07:01:46 +0000 (15:01 +0800)
There is no PDF for virtual pods now. And daisy_passwd was deleted
from the deploy.yml of zte-virtual1 in pharos.

Change-Id: I0a6fba8fa634806a21779a382f5ff07f9450e270
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
deploy/get_conf.py

index 97d2feb..bd72aab 100755 (executable)
@@ -125,6 +125,8 @@ def get_yml_para(dha_file):
     controller_node_size = disks.get("controller", 0)
     compute_node_size = disks.get("compute", 0)
     daisy_passwd = data.get("daisy_passwd", "")
+    if not daisy_passwd:
+        daisy_passwd = "r00tme"
     daisy_ip = data.get("daisy_ip", "")
     daisy_gateway = data.get("daisy_gateway", "")
     daisy_target_node = data.get("hosts", "")
@@ -140,9 +142,9 @@ def get_conf_from_deploy():
     daisyserver_size, controller_node_size, compute_node_size,\
         daisy_passwd, daisy_ip, daisy_gateway,\
         hosts_num = get_yml_para(conf['dha'])
-    print "{hosts_num} {ip} {passwd} -s {size} -g {gateway}".format(
+    print "{hosts_num} {ip} {daisy_passwd} -s {size} -g {gateway}".format(
         hosts_num=hosts_num,
-        passwd=daisy_passwd,
+        daisy_passwd=daisy_passwd,
         size=daisyserver_size,
         ip=daisy_ip,
         gateway=daisy_gateway)