diff options
author | Dan Radez <dradez@redhat.com> | 2016-09-26 20:02:30 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-26 20:02:30 +0000 |
commit | 8d6e0e73023eeaeef681880bad87a5ea8044bc73 (patch) | |
tree | 040dabe09fc9ef5221cf8938e9ebf614d49656cc /lib/virtual-setup-functions.sh | |
parent | dd6bb69f77dda4d89876efd1524e907a1bf44748 (diff) | |
parent | 38de9ff18e44e5c3c1393c060481fbbb27543704 (diff) |
Merge "migrating to proposed common network settings file"
Diffstat (limited to 'lib/virtual-setup-functions.sh')
-rwxr-xr-x | lib/virtual-setup-functions.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/virtual-setup-functions.sh b/lib/virtual-setup-functions.sh index 116d19b6..8aaa3594 100755 --- a/lib/virtual-setup-functions.sh +++ b/lib/virtual-setup-functions.sh @@ -51,8 +51,8 @@ EOF fi fi if ! virsh list --all | grep baremetal${i} > /dev/null; then - define_vm baremetal${i} network 41 'admin_network' $vcpus $ramsize - for n in private_network public_network storage_network api_network; do + define_vm baremetal${i} network 41 'admin' $vcpus $ramsize + for n in tenant external storage api; do if [[ $enabled_network_list =~ $n ]]; then echo -n "$n " virsh attach-interface --domain baremetal${i} --type network --source $n --model virtio --config @@ -62,7 +62,7 @@ EOF echo "Found baremetal${i} VM, using existing VM" fi #virsh vol-list default | grep baremetal${i} 2>&1> /dev/null || virsh vol-create-as default baremetal${i}.qcow2 41G --format qcow2 - mac=$(virsh domiflist baremetal${i} | grep admin_network | awk '{ print $5 }') + mac=$(virsh domiflist baremetal${i} | grep admin | awk '{ print $5 }') cat >> $APEX_TMP_DIR/inventory-virt.yaml << EOF node${i}: |