diff options
| -rwxr-xr-x | xci/playbooks/roles/configure-network/files/network-config-suse | 2 | ||||
| -rwxr-xr-x | xci/scripts/vm/start-new-vm.sh | 3 | ||||
| -rwxr-xr-x | xci/xci-deploy.sh | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/xci/playbooks/roles/configure-network/files/network-config-suse b/xci/playbooks/roles/configure-network/files/network-config-suse index 1a9f1e7d..02cdd998 100755 --- a/xci/playbooks/roles/configure-network/files/network-config-suse +++ b/xci/playbooks/roles/configure-network/files/network-config-suse @@ -8,7 +8,9 @@ if [[ $INTERFACE == "br-vlan" ]]; then ip link add br-vlan-veth type veth peer name eth12 || true ip link set br-vlan-veth up ip link set eth12 up + brctl addif br-vlan br-vlan-veth else + brctl delif br-vlan br-vlan-veth ip link del br-vlan-veth || true fi fi diff --git a/xci/scripts/vm/start-new-vm.sh b/xci/scripts/vm/start-new-vm.sh index a6942746..9c3672e0 100755 --- a/xci/scripts/vm/start-new-vm.sh +++ b/xci/scripts/vm/start-new-vm.sh @@ -288,8 +288,7 @@ echo "Preparing test environment..." # *_xci_vm hostname is invalid. Letst just use distro name $vm_ssh ${VM_NAME} "sudo hostname ${VM_NAME/_xci*}" # Start with good dns -$vm_ssh ${VM_NAME} 'sudo bash -c "echo nameserver 8.8.8.8 > /etc/resolv.conf"' -$vm_ssh ${VM_NAME} 'sudo bash -c "echo nameserver 8.8.4.4 >> /etc/resolv.conf"' +$vm_ssh ${VM_NAME} 'sudo bash -c "echo nameserver 192.168.140.1 > /etc/resolv.conf"' cat > ${BASE_PATH}/vm_hosts.txt <<EOF 127.0.0.1 localhost ${VM_NAME/_xci*} ::1 localhost ipv6-localhost ipv6-loopback diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh index 20f3d95a..a7435e75 100755 --- a/xci/xci-deploy.sh +++ b/xci/xci-deploy.sh @@ -268,7 +268,7 @@ echo "Info: Setting up infrastructure" echo "-----------------------------------------------------------------------" echo "xci: running ansible playbook setup-infrastructure.yml" ssh root@$OPNFV_HOST_IP "openstack-ansible ${XCI_ANSIBLE_VERBOSITY} \ - $OPENSTACK_OSA_PATH/playbooks//setup-infrastructure.yml | tee setup-infrastructure.log" + $OPENSTACK_OSA_PATH/playbooks/setup-infrastructure.yml | tee setup-infrastructure.log" scp root@$OPNFV_HOST_IP:~/setup-infrastructure.log $LOG_PATH/setup-infrastructure.log echo "-----------------------------------------------------------------------" # check the log to see if we have any error |