diff options
| -rwxr-xr-x | deploy/launch.sh | 5 | ||||
| -rw-r--r-- | deploy/opera_adapter.py | 23 |
2 files changed, 22 insertions, 6 deletions
diff --git a/deploy/launch.sh b/deploy/launch.sh index aa476784..5f1ee1cb 100755 --- a/deploy/launch.sh +++ b/deploy/launch.sh @@ -142,5 +142,8 @@ echo "NOTE: openrc file is in the controller nodes" echo "" if [[ ${DHA##*/} =~ "openo" ]]; then - python ${COMPASS_DIR}/deploy/opera_adapter.py $DHA $NETWORK + sudo python ${COMPASS_DIR}/deploy/opera_adapter.py $DHA $NETWORK + if [[ $? -ne 0 ]]; then + exit 1 + fi fi diff --git a/deploy/opera_adapter.py b/deploy/opera_adapter.py index 09702fc8..71f19951 100644 --- a/deploy/opera_adapter.py +++ b/deploy/opera_adapter.py @@ -47,11 +47,24 @@ def sync_openo_config(openo_config, dha, network): def sync_admin_openrc(network, admin_openrc_file): - ip = re.compile("\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}") - with open(admin_openrc_file, 'r+') as fd: - data = fd.read() - fd.seek(0) - fd.write(re.sub(ip, network['public_vip']['ip'], data)) + ssh_opts = "-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" + vip = network['public_vip']['ip'] + cmd = 'sshpass -p"root" ssh %s root@%s "cat /opt/admin-openrc.sh"' \ + % (ssh_opts, vip) + ssh = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE) + if ssh.stdout is None: + print("fetch openrc fail") + sys.exit(1) + + rcdata = ssh.stdout.readlines() + with open(admin_openrc_file, 'w') as fd: + ip = re.compile("\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}") + for i in rcdata: + if 'OS_AUTH_URL' in i: + i = re.sub(ip, vip, i) + fd.write(i) + + fd.write('export OS_REGION_NAME=RegionOne') if __name__ == "__main__": |