From f7f241a12f9740889c799b95b9271bc7b496a4c0 Mon Sep 17 00:00:00 2001 From: David Ribeiro Alves Date: Sun, 1 Apr 2012 22:07:50 +0100 Subject: [PATCH] reverted the preseed and corrected a test to account for multiple masters --- .../src/main/resources/default-images.yaml | 27 ++++--------------- ...rtualBoxComputeServiceAdapterLiveTest.java | 2 +- .../src/test/resources/default-images.yaml | 27 ++++--------------- 3 files changed, 11 insertions(+), 45 deletions(-) diff --git a/labs/virtualbox/src/main/resources/default-images.yaml b/labs/virtualbox/src/main/resources/default-images.yaml index b1f6d2895d..84380c2b1f 100644 --- a/labs/virtualbox/src/main/resources/default-images.yaml +++ b/labs/virtualbox/src/main/resources/default-images.yaml @@ -87,26 +87,21 @@ images: d-i debian-installer/locale string en_US.utf8 d-i console-setup/ask_detect boolean false d-i console-setup/layout string USA - #d-i netcfg/get_hostname string dummy d-i netcfg/get_hostname string unassigned-hostname d-i netcfg/get_domain string unassigned-domain # Continue without a default route # Not working , specify a dummy in the DHCP - #d-i netcfg/no_default_route boolean d-i time/zone string UTC d-i clock-setup/utc-auto boolean true d-i clock-setup/utc boolean true - d-i kbd-chooser/method select American English + d-i kbd-chooser/method select American English d-i netcfg/wireless_wep string d-i base-installer/kernel/override-image string linux-server - #d-i base-installer/kernel/override-image string linux-image-2.6.32-21-generic # Choices: Dialog, Readline, Gnome, Kde, Editor, Noninteractive d-i debconf debconf/frontend select Noninteractive d-i pkgsel/install-language-support boolean false tasksel tasksel/first multiselect standard, ubuntu-server - #d-i partman-auto/method string regular d-i partman-auto/method string lvm - #d-i partman-auto/purge_lvm_from_device boolean true d-i partman-lvm/confirm boolean true d-i partman-lvm/device_remove_lvm boolean true d-i partman-auto/choose_recipe select atomic @@ -114,22 +109,17 @@ images: d-i partman/confirm_nooverwrite boolean true d-i partman/choose_partition select finish d-i partman/confirm boolean true - #http://ubuntu-virginia.ubuntuforums.org/showthread.php?p=9626883 - #Message: "write the changes to disk and configure lvm preseed" - #http://serverfault.com/questions/189328/ubuntu-kickstart-installation-using-lvm-waits-for-input - #preseed partman-lvm/confirm_nooverwrite boolean true # Write the changes to disks and configure LVM? d-i partman-lvm/confirm boolean true d-i partman-lvm/confirm_nooverwrite boolean true d-i partman-auto-lvm/guided_size string max ## Default user, we can get away with a recipe to change this - d-i passwd/user-fullname string vagrant - d-i passwd/username string vagrant - d-i passwd/user-password password vagrant - d-i passwd/user-password-again password vagrant + d-i passwd/user-fullname string toor + d-i passwd/username string toor + d-i passwd/user-password password password + d-i passwd/user-password-again password password d-i user-setup/encrypt-home boolean false d-i user-setup/allow-password-weak boolean true - ## minimum is puppet and ssh and ntp # Individual additional packages to install d-i pkgsel/include string openssh-server ntp # Whether to upgrade packages after debootstrap. @@ -142,11 +132,4 @@ images: d-i pkgsel/update-policy select none # debconf-get-selections --install #Use mirror - #d-i apt-setup/use_mirror boolean true - #d-i mirror/country string manual - #choose-mirror-bin mirror/protocol string http - #choose-mirror-bin mirror/http/hostname string 192.168.4.150 - #choose-mirror-bin mirror/http/directory string /ubuntu - #choose-mirror-bin mirror/suite select maverick - #d-i debian-installer/allow_unauthenticated string true choose-mirror-bin mirror/http/proxy string \ No newline at end of file diff --git a/labs/virtualbox/src/test/java/org/jclouds/virtualbox/compute/VirtualBoxComputeServiceAdapterLiveTest.java b/labs/virtualbox/src/test/java/org/jclouds/virtualbox/compute/VirtualBoxComputeServiceAdapterLiveTest.java index 5535b11690..b01067c948 100644 --- a/labs/virtualbox/src/test/java/org/jclouds/virtualbox/compute/VirtualBoxComputeServiceAdapterLiveTest.java +++ b/labs/virtualbox/src/test/java/org/jclouds/virtualbox/compute/VirtualBoxComputeServiceAdapterLiveTest.java @@ -77,7 +77,7 @@ public class VirtualBoxComputeServiceAdapterLiveTest extends BaseVirtualBoxClien @Test public void testListHardwareProfiles() { Iterable profiles = adapter.listHardwareProfiles(); - assertEquals(1, Iterables.size(profiles)); + assertTrue(!Iterables.isEmpty(profiles)); } @Test diff --git a/labs/virtualbox/src/test/resources/default-images.yaml b/labs/virtualbox/src/test/resources/default-images.yaml index 6fda47dee5..4efa20d277 100644 --- a/labs/virtualbox/src/test/resources/default-images.yaml +++ b/labs/virtualbox/src/test/resources/default-images.yaml @@ -87,26 +87,21 @@ images: d-i debian-installer/locale string en_US.utf8 d-i console-setup/ask_detect boolean false d-i console-setup/layout string USA - #d-i netcfg/get_hostname string dummy d-i netcfg/get_hostname string unassigned-hostname d-i netcfg/get_domain string unassigned-domain # Continue without a default route # Not working , specify a dummy in the DHCP - #d-i netcfg/no_default_route boolean d-i time/zone string UTC d-i clock-setup/utc-auto boolean true d-i clock-setup/utc boolean true - d-i kbd-chooser/method select American English + d-i kbd-chooser/method select American English d-i netcfg/wireless_wep string d-i base-installer/kernel/override-image string linux-server - #d-i base-installer/kernel/override-image string linux-image-2.6.32-21-generic # Choices: Dialog, Readline, Gnome, Kde, Editor, Noninteractive d-i debconf debconf/frontend select Noninteractive d-i pkgsel/install-language-support boolean false tasksel tasksel/first multiselect standard, ubuntu-server - #d-i partman-auto/method string regular d-i partman-auto/method string lvm - #d-i partman-auto/purge_lvm_from_device boolean true d-i partman-lvm/confirm boolean true d-i partman-lvm/device_remove_lvm boolean true d-i partman-auto/choose_recipe select atomic @@ -114,22 +109,17 @@ images: d-i partman/confirm_nooverwrite boolean true d-i partman/choose_partition select finish d-i partman/confirm boolean true - #http://ubuntu-virginia.ubuntuforums.org/showthread.php?p=9626883 - #Message: "write the changes to disk and configure lvm preseed" - #http://serverfault.com/questions/189328/ubuntu-kickstart-installation-using-lvm-waits-for-input - #preseed partman-lvm/confirm_nooverwrite boolean true # Write the changes to disks and configure LVM? d-i partman-lvm/confirm boolean true d-i partman-lvm/confirm_nooverwrite boolean true d-i partman-auto-lvm/guided_size string max ## Default user, we can get away with a recipe to change this - d-i passwd/user-fullname string vagrant - d-i passwd/username string vagrant - d-i passwd/user-password password vagrant - d-i passwd/user-password-again password vagrant + d-i passwd/user-fullname string toor + d-i passwd/username string toor + d-i passwd/user-password password password + d-i passwd/user-password-again password password d-i user-setup/encrypt-home boolean false d-i user-setup/allow-password-weak boolean true - ## minimum is puppet and ssh and ntp # Individual additional packages to install d-i pkgsel/include string openssh-server ntp # Whether to upgrade packages after debootstrap. @@ -142,11 +132,4 @@ images: d-i pkgsel/update-policy select none # debconf-get-selections --install #Use mirror - #d-i apt-setup/use_mirror boolean true - #d-i mirror/country string manual - #choose-mirror-bin mirror/protocol string http - #choose-mirror-bin mirror/http/hostname string 192.168.4.150 - #choose-mirror-bin mirror/http/directory string /ubuntu - #choose-mirror-bin mirror/suite select maverick - #d-i debian-installer/allow_unauthenticated string true choose-mirror-bin mirror/http/proxy string \ No newline at end of file