summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
Diffstat (limited to 'deploy')
-rwxr-xr-xdeploy/check_openstack_progress.sh6
-rw-r--r--deploy/config/bm_environment/zte-baremetal1/deploy.yml60
-rw-r--r--deploy/config/vm_environment/zte-virtual1/deploy.yml40
-rw-r--r--deploy/config/vm_environment/zte-virtual2/deploy.yml12
-rwxr-xr-xdeploy/get_conf.py6
5 files changed, 63 insertions, 61 deletions
diff --git a/deploy/check_openstack_progress.sh b/deploy/check_openstack_progress.sh
index 1aa3570a..ea7819a5 100755
--- a/deploy/check_openstack_progress.sh
+++ b/deploy/check_openstack_progress.sh
@@ -79,8 +79,8 @@ while true; do
count=$[count + 1]
# get 'Role_status' column
- openstack_install_active=`daisy host-list --cluster-id $cluster_id | awk -F "|" '{print $13}' | grep -c "active" `
- openstack_install_failed=`daisy host-list --cluster-id $cluster_id | awk -F "|" '{print $13}' | grep -c "install-failed" `
+ openstack_install_active=`daisy host-list --cluster-id $cluster_id | awk -F "|" '{print $14}' | grep -c "active" `
+ openstack_install_failed=`daisy host-list --cluster-id $cluster_id | awk -F "|" '{print $14}' | grep -c "install-failed" `
if [ $openstack_install_active -eq $hosts_num ]; then
echo "openstack installation succeded ..."
break
@@ -90,7 +90,7 @@ while true; do
exit 1
else
# get 'Role_progress' column
- progress=`daisy host-list --cluster-id $cluster_id |grep DISCOVERY_SUCCESSFUL |awk -F "|" '{print $12}'|sed s/[[:space:]]//g|sed ':a;N;$ s/\n/ /g;ba'`
+ progress=`daisy host-list --cluster-id $cluster_id |grep DISCOVERY_SUCCESSFUL |awk -F "|" '{print $13}'|sed s/[[:space:]]//g|sed ':a;N;$ s/\n/ /g;ba'`
echo " openstack in installing , progress of each node is $progress%"
sleep 30
fi
diff --git a/deploy/config/bm_environment/zte-baremetal1/deploy.yml b/deploy/config/bm_environment/zte-baremetal1/deploy.yml
index 0c147280..620dd5f4 100644
--- a/deploy/config/bm_environment/zte-baremetal1/deploy.yml
+++ b/deploy/config/bm_environment/zte-baremetal1/deploy.yml
@@ -1,35 +1,35 @@
adapter: 'ipmi'
hosts:
-- name: 'controller01'
- roles:
- - 'CONTROLLER_LB'
- ipmi_ip: '192.168.1.106'
- ipmi_user: 'testuser'
- ipmi_pass: 'testpass'
-- name: 'controller02'
- roles:
- - 'CONTROLLER_LB'
- ipmi_ip: '192.168.1.107'
- ipmi_user: 'testuser'
- ipmi_pass: 'testpass'
-- name: 'controller03'
- roles:
- - 'CONTROLLER_LB'
- ipmi_ip: '192.168.1.108'
- ipmi_user: 'testuser'
- ipmi_pass: 'testpass'
-- name: 'computer01'
- roles:
- - 'COMPUTER'
- ipmi_ip: '192.168.1.109'
- ipmi_user: 'testuser'
- ipmi_pass: 'testpass'
-- name: 'computer02'
- roles:
- - 'COMPUTER'
- ipmi_ip: '192.168.1.110'
- ipmi_user: 'testuser'
- ipmi_pass: 'testpass'
+ - name: 'controller01'
+ roles:
+ - 'CONTROLLER_LB'
+ ipmi_ip: '192.168.1.106'
+ ipmi_user: 'testuser'
+ ipmi_pass: 'testpass'
+ - name: 'controller02'
+ roles:
+ - 'CONTROLLER_LB'
+ ipmi_ip: '192.168.1.107'
+ ipmi_user: 'testuser'
+ ipmi_pass: 'testpass'
+ - name: 'controller03'
+ roles:
+ - 'CONTROLLER_LB'
+ ipmi_ip: '192.168.1.108'
+ ipmi_user: 'testuser'
+ ipmi_pass: 'testpass'
+ - name: 'computer01'
+ roles:
+ - 'COMPUTER'
+ ipmi_ip: '192.168.1.109'
+ ipmi_user: 'testuser'
+ ipmi_pass: 'testpass'
+ - name: 'computer02'
+ roles:
+ - 'COMPUTER'
+ ipmi_ip: '192.168.1.110'
+ ipmi_user: 'testuser'
+ ipmi_pass: 'testpass'
disks:
daisy: 50
daisy_passwd: 'r00tme'
diff --git a/deploy/config/vm_environment/zte-virtual1/deploy.yml b/deploy/config/vm_environment/zte-virtual1/deploy.yml
index e80d0310..e17214cf 100644
--- a/deploy/config/vm_environment/zte-virtual1/deploy.yml
+++ b/deploy/config/vm_environment/zte-virtual1/deploy.yml
@@ -1,25 +1,25 @@
adapter: libvirt
hosts:
-- name: 'controller01'
- roles:
- - 'CONTROLLER_LB'
- template: 'templates/virtual_environment/vms/controller.xml'
-- name: 'controller02'
- roles:
- - 'CONTROLLER_LB'
- template: 'templates/virtual_environment/vms/controller.xml'
-- name: 'controller03'
- roles:
- - 'CONTROLLER_LB'
- template: 'templates/virtual_environment/vms/controller.xml'
-- name: 'computer01'
- roles:
- - 'COMPUTER'
- template: 'templates/virtual_environment/vms/computer.xml'
-- name: 'computer02'
- roles:
- - 'COMPUTER'
- template: 'templates/virtual_environment/vms/computer.xml'
+ - name: 'controller01'
+ roles:
+ - 'CONTROLLER_LB'
+ template: 'templates/virtual_environment/vms/controller.xml'
+ - name: 'controller02'
+ roles:
+ - 'CONTROLLER_LB'
+ template: 'templates/virtual_environment/vms/controller.xml'
+ - name: 'controller03'
+ roles:
+ - 'CONTROLLER_LB'
+ template: 'templates/virtual_environment/vms/controller.xml'
+ - name: 'computer01'
+ roles:
+ - 'COMPUTER'
+ template: 'templates/virtual_environment/vms/computer.xml'
+ - name: 'computer02'
+ roles:
+ - 'COMPUTER'
+ template: 'templates/virtual_environment/vms/computer.xml'
disks:
daisy: 50
controller: 110
diff --git a/deploy/config/vm_environment/zte-virtual2/deploy.yml b/deploy/config/vm_environment/zte-virtual2/deploy.yml
index d4c99e97..c6c7d238 100644
--- a/deploy/config/vm_environment/zte-virtual2/deploy.yml
+++ b/deploy/config/vm_environment/zte-virtual2/deploy.yml
@@ -1,10 +1,10 @@
adapter: libvirt
hosts:
-- name: 'all_in_one'
- roles:
- - 'CONTROLLER_LB'
- - 'COMPUTER'
- template: 'templates/virtual_environment/vms/all_in_one.xml'
+ - name: 'all_in_one'
+ roles:
+ - 'CONTROLLER_LB'
+ - 'COMPUTER'
+ template: 'templates/virtual_environment/vms/all_in_one.xml'
disks:
daisy: 50
controller: 110
@@ -12,4 +12,4 @@ disks:
daisy_passwd: 'r00tme'
daisy_ip: '10.20.11.2'
daisy_gateway: '10.20.11.1'
-ceph_disk_name: '' \ No newline at end of file
+ceph_disk_name: ''
diff --git a/deploy/get_conf.py b/deploy/get_conf.py
index 97d2feba..bd72aabb 100755
--- a/deploy/get_conf.py
+++ b/deploy/get_conf.py
@@ -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)