diff options
author | Dan Radez <dradez@redhat.com> | 2016-07-19 13:17:17 -0400 |
---|---|---|
committer | Dan Radez <dradez@redhat.com> | 2016-09-22 15:03:58 -0400 |
commit | 38de9ff18e44e5c3c1393c060481fbbb27543704 (patch) | |
tree | 0e1b93aba5d03b08ed3a44f5c7e96e6b66788656 /lib/virtual-setup-functions.sh | |
parent | 30a2e131972b7b4dbccb702f0fc329ca6b2dd6a6 (diff) |
migrating to proposed common network settings file
- proposed in genesis
https://wiki.opnfv.org/display/genesis/Common+Network+Settings
- This patch updates the network_settings files in the config/network dir
and updates the associated bash, python and python tests relative to
the new yaml structure and nomenclature used in the proposed settings
file
JIRA: APEX-262
Change-Id: Ib0dc9d0f21465b38f2a53cff20f71fb9230bfc48
Signed-off-by: Dan Radez <dradez@redhat.com>
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}: |