diff --git a/lib/metadata.sh b/lib/metadata.sh deleted file mode 100644 index 9c3617a..0000000 --- a/lib/metadata.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -function metadata_start() { - local vpc="${1}" - local ip="${2}" - local port="${3}" - local vm_name="${4}" - local ssh_key="${5}" - local vm="${6}" - PASSWORD="\$6\$LD5z9v/s2b170Twj\$pl1B/Mz0w8PCr7JhFcclQpBSxUQTDOiuPko8yf4LntEo8FrIo2yKVeHR6fb5VQpxX9NP2k9yhXdsp671Sc56u1" - - /opt/two/bin/meta --start --vm_name "${vm}" \ - --ip "${ip}" \ - --key "${ssh_key}" \ - --pass "${PASSWORD}" \ - --port "${port}" \ - --vpc_name "${vpc}" -} - -function metadata_stop() { - vm="${1}" - - /opt/two/bin/meta --stop --vm_name "${vm}" -} \ No newline at end of file diff --git a/lib/qemu.sh b/lib/qemu.sh index 681c65e..fd9ee45 100644 --- a/lib/qemu.sh +++ b/lib/qemu.sh @@ -51,7 +51,13 @@ function qemu_start_vm { print_in_color "${COLOR_GREEN}" "Create tap tap${tap_id}" add_in_db "vm" "${vm_name}" "${subnet_name}" "${tap_id}" "${metadata_port}" "${ip}" "${public_ip}" create_tap "${tap_id}" "br-${subnet_id}" "${vpc_name}" - metadata_start "${vpc_name}" "${gateway_ip}" "${metadata_port}" "${vm_name}" "${ssh_key}" "${vm_name}" + PASSWORD="\$6\$LD5z9v/s2b170Twj\$pl1B/Mz0w8PCr7JhFcclQpBSxUQTDOiuPko8yf4LntEo8FrIo2yKVeHR6fb5VQpxX9NP2k9yhXdsp671Sc56u1" + /opt/two/bin/meta --start --vm_name "${vm_name}" \ + --ip "${gateway_ip}" \ + --key "${ssh_key}" \ + --pass "${PASSWORD}" \ + --port "${metadata_port}" \ + --vpc_name "${vpc_name}" ip netns exec "${vpc_name}" iptables -t nat -A PREROUTING -s "${ip}/32" -d "169.254.169.254/32" -p tcp -m tcp --dport 80 -j DNAT --to-destination "${gateway_ip}:${metadata_port}" print_in_color "${COLOR_GREEN}" "Start vm ${vm_name}" @@ -94,7 +100,7 @@ function qemu_stop_vm { print_in_color "${COLOR_RED}" "Delete tap${tap_id}" ip -n "${vpc_name}" link del dev "tap${tap_id}" - metadata_stop "${vm_name}" + /opt/two/bin/meta --stop --vm_name "${vm_name}" delete_public_ip "${vpc_name}" "${public_ip}" "${ip}" delete_in_db "vm" "${vm_name}"