Be even more verbose

And add additional nameserver.

Change-Id: I289e1b196b4e3513215e7ae7c2ac18e5ba128f0a
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh
index 64f0913..e10b9f3 100644 (file)
--- a/packer/provision/baseline.sh
+++ b/packer/provision/baseline.sh
@@ -109,17 +109,30 @@ EOF
     cat /etc/apt/sources.list
     echo "---> printing sources.list <---"
 
+    echo "---> printing resolv.conf <---"
+    cat /etc/resolv.conf || true
+    echo "---> printing resolv.conf <---"
+
+    ping -c 2 8.8.8.8
+
+    echo "nameserver 8.8.8.8" >> /etc/resolv.conf
+
+    echo "---> printing resolv.conf <---"
+    cat /etc/resolv.conf || true
+    echo "---> printing resolv.conf <---"
+
+
     echo "---> Updating operating system"
-    apt-get update -qq > /dev/null
-    apt-get upgrade -qq > /dev/null
+    apt-get update
+    apt-get dist-upgrade -y
 
     # add in stuff we know we need
     echo "---> Installing base packages"
-    apt-get install -qq unzip xz-utils puppet git libxml-xpath-perl make wget > /dev/null
+    apt-get install -y unzip xz-utils puppet git libxml-xpath-perl make wget
 
     # install Java 7
     echo "---> Configuring OpenJDK"
-    apt-get install -qq default-jre-headless default-jdk-headless > /dev/null
+    apt-get install -y default-jre-headless default-jdk-headless
 
 }
 

diff --git a/packer/templates/basebuild-local-kvm.json b/packer/templates/basebuild-local-kvm.json
index 4c36ddd..10ae712 100644 (file)
--- a/packer/templates/basebuild-local-kvm.json
+++ b/packer/templates/basebuild-local-kvm.json
@@ -1,12 +1,12 @@
 {
   "variables": {
-    "stack_tenant": null,
-    "stack_user": null,
-    "stack_pass": null,
-    "stack_network": null,
+    "stack_tenant": "ubuntu",
+    "stack_user": "ubuntu",
+    "stack_pass": "ubuntu",
+    "stack_network": "none",
 
     "base_image": null,
-    "cloud_user": null,
+    "cloud_user": "ubuntu",
     "distro": null,
     "cloud_user_data": null
   },