diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-12 13:24:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-12 13:24:07 +0000 |
| commit | 798c781b97a6a92b01f3f4cd0c85b50e92648627 (patch) | |
| tree | 1037226036567833d1f3a22f35eca2e915d68b64 /mcp/scripts/lib.sh | |
| parent | fd5dd042186d04be3dd88b91d6208d4fbaf8bdec (diff) | |
| parent | b666bc50b2b8b1bb8cde5cdab280f0409bde4958 (diff) | |
Merge "[cleanup] FN VMs: Fold user-data templates"
Diffstat (limited to 'mcp/scripts/lib.sh')
| -rw-r--r-- | mcp/scripts/lib.sh | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index 9b1e32c04..34229df08 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -287,13 +287,8 @@ function prepare_vms { # Create config ISO and resize OS disk image for each foundation node VM for node in "${vnodes[@]}"; do - if [[ "${node}" =~ ^(cfg01|mas01) ]]; then - user_data='user-data.mcp.sh' - else - user_data='user-data.admin.sh' - fi ./create-config-drive.sh -k "$(basename "${SSH_KEY}").pub" \ - -u "${user_data}" -h "${node}" "${image_dir}/mcp_${node}.iso" + -u 'user-data.sh' -h "${node}" "${image_dir}/mcp_${node}.iso" cp "${image_dir}/${image}" "${image_dir}/mcp_${node}.qcow2" qemu-img resize "${image_dir}/mcp_${node}.qcow2" 100G # Prepare dedicated drive for cinder on cmp nodes @@ -468,13 +463,6 @@ function create_vms { done } -function update_mcpcontrol_network { - # set static ip address for salt master node, MaaS node - local amac=$(virsh domiflist mas01 2>&1| awk '/mcpcontrol/ {print $5; exit}') - [ -z "${amac}" ] || virsh net-update "mcpcontrol" add ip-dhcp-host \ - "<host mac='${amac}' name='mas01' ip='${MAAS_IP}'/>" --live --config -} - function reset_vms { local vnodes=("$@") local cmd_str="ssh ${SSH_OPTS} ${SSH_SALT}" |