diff options
Diffstat (limited to 'deploy')
-rwxr-xr-x | deploy/get_conf.py | 11 | ||||
-rwxr-xr-x | deploy/tempest.py | 24 | ||||
-rwxr-xr-x | deploy/trustme.sh | 17 |
3 files changed, 36 insertions, 16 deletions
diff --git a/deploy/get_conf.py b/deploy/get_conf.py index eaac8b17..a2d7bf6a 100755 --- a/deploy/get_conf.py +++ b/deploy/get_conf.py @@ -23,8 +23,9 @@ def decorator_mk(types): result = {} for item in item_list: ret = func(item) - if ret.keys()[0] in result: - result[ret.keys()[0]].append(ret.values()[0][0]) + item_name = ret.keys().pop() + if result is not None and item_name in result: + result[item_name] = result[item_name] + ret[item_name] else: result.update(ret) return result @@ -93,10 +94,4 @@ def config(dha_file, network_file): hosts_name = dha_config_parse(data, dha_file) data = init(network_file) network_map, vip, interface_map = network_config_parse(data, network_file) - for interface_name in interface_map: - for name in interface_map[interface_name]: - if name.get('name', None) == 'MANAGEMENT': - name['ip'] = network_map.get( - 'MANAGEMENT', None).get( - 'ip_ranges', None)[0].get('start', None) return interface_map, hosts_name, network_map, vip diff --git a/deploy/tempest.py b/deploy/tempest.py index 1efe159f..3459cb07 100755 --- a/deploy/tempest.py +++ b/deploy/tempest.py @@ -14,11 +14,11 @@ from daisyclient.v1 import client as daisy_client import get_conf import traceback import time +import os daisy_version = 1.0 -daisy_endpoint = "http://127.0.0.1:19292" -client = daisy_client.Client(version=daisy_version, endpoint=daisy_endpoint) -iso_path = "/var/lib/daisy/kolla/CentOS-7-x86_64-DVD-1511.iso" +daisyrc_path = "/root/daisyrc_admin" +iso_path = "/var/lib/daisy/kolla/" deployment_interface = "ens3" cluster_name = "clustertest" @@ -46,6 +46,17 @@ def print_bar(msg): print ("--------------------------------------------") +def get_endpoint(file_path): + for line in open(file_path): + if 'OS_ENDPOINT' in line: + daisyrc_admin_line = line.strip() + 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) + + def prepare_install(): try: print("get config...") @@ -141,7 +152,12 @@ def add_hosts_interface(cluster_id, hosts_info, host_interface_map, interface_name = interface['name'] interface['assigned_networks'] = \ host_interface_map[interface_name] - host['os_version'] = iso_path + pathlist = os.listdir(iso_path) + for filename in pathlist: + if filename.endswith('iso'): + host['os_version'] = iso_path + filename + if host['os_version'] == iso_path: + print("do not have os iso file in /var/lib/daisy/kolla/.") client.hosts.update(host['id'], **host) print("update role...") add_host_role(cluster_id, host['id'], host['name'], vip) diff --git a/deploy/trustme.sh b/deploy/trustme.sh index eedda5ce..33b76546 100755 --- a/deploy/trustme.sh +++ b/deploy/trustme.sh @@ -10,6 +10,11 @@ function print_log echo -e "`date -d today +"%Y-%m-%d %H:%M:%S"` $promt" >> $logfile } ip=$1 +if [ -z $ip ]; then + print_log "Usage: `basename $0` ipaddr passwd" + exit 1 +fi + passwd=$2 if [ -z $passwd ]; then print_log "Usage: `basename $0` ipaddr passwd" @@ -47,11 +52,15 @@ host=`hostname` keyend="$user@$host" print_log "my keyend = $keyend" cmd="sed '/$keyend$/d' -i ~/.ssh/authorized_keys" +local_host="127.0.0.1" print_log "clear my old pub key on $local_host ..." -ssh-keygen -f "/root/.ssh/known_hosts" -R $ip -if [ $? != 0 ]; then - print_log "delete pub key of $ip from known_hosts failed" - exit 1 +sshpass -p $passwd ssh -o StrictHostKeyChecking=no $local_host "test -f ~/.ssh/known_hosts" +if [ $? = 0 ]; then + sshpass -p $passwd ssh -o StrictHostKeyChecking=no $local_host "sed -i '/${ip} /d' ~/.ssh/known_hosts" + if [ $? != 0 ]; then + print_log "delete pub key of $ip from $local_host known_hosts failed" + exit 1 + fi fi sshpass -p $passwd ssh -o StrictHostKeyChecking=no $ip "mkdir -p ~/.ssh && touch ~/.ssh/authorized_keys" if [ $? != 0 ]; then |