summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-11-23 09:50:07 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-11-23 09:50:07 +0000
commitf365ad89be8f4d17d04325b118a15da81ef7bf05 (patch)
treea932f37b0126d9516670dd53f0602990162d6f9f
parent04d157cd1535097268da9d9441bcc411da687c85 (diff)
parent71618d89c38daea7b97d14d40a31c7cb00bc69f5 (diff)
Merge "Add the libvirt DNS to resolv.conf"
-rwxr-xr-xxci/scripts/vm/start-new-vm.sh3
-rwxr-xr-xxci/xci-deploy.sh2
2 files changed, 2 insertions, 3 deletions
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