Refresh ubuntu-14.04
Closes-Bug: PROD-21397 (PROD:21397)
Change-Id: I5a7717e26c016bd5a89d9cb1031dca7c14299050
diff --git a/ubuntu-16.04/http/preseed.cfg b/ubuntu-16.04/http/preseed.cfg
deleted file mode 100644
index 269a2bc..0000000
--- a/ubuntu-16.04/http/preseed.cfg
+++ /dev/null
@@ -1,54 +0,0 @@
-choose-mirror-bin mirror/http/proxy string
-d-i debian-installer/locale string en_US
-d-i debian-installer/language string en
-d-i debian-installer/country EN
-
-d-i pkgsel/install-language-support boolean false
-
-d-i debian-installer/framebuffer boolean false
-d-i debconf/frontend select noninteractive
-d-i base-installer/kernel/override-image string linux-server
-d-i clock-setup/utc boolean true
-d-i clock-setup/utc-auto boolean true
-d-i finish-install/reboot_in_progress note
-d-i grub-installer/only_debian boolean true
-d-i grub-installer/with_other_os boolean true
-d-i netcfg/get_domain string unassigned-domain
-d-i netcfg/get_hostname string unassigned-hostname
-
-d-i partman-auto/disk string /dev/sda /dev/vda
-d-i partman-auto/method string regular
-d-i partman/choose_partition select finish
-d-i partman/confirm boolean true
-d-i partman/confirm_nooverwrite boolean true
-d-i partman/confirm_write_new_label boolean true
-d-i partman-basicfilesystems/no_swap boolean false
-d-i partman-auto/choose_recipe select boot-root
-
-d-i partman-auto/expert_recipe string \
- boot-root :: \
- 512 512 -1 ext4 \
- $primary{ } $bootable{ } \
- method{ format } format{ } \
- use_filesystem{ } filesystem{ ext4 } \
- mountpoint{ / } \
- options/noatime{ noatime } \
- . \
-
-d-i pkgsel/include string openssh-server
-d-i pkgsel/install-language-support boolean false
-d-i pkgsel/update-policy select none
-popularity-contest popularity-contest/participate boolean false
-
-d-i pkgsel/upgrade select none
-
-d-i time/zone string UTC
-d-i passwd/root-login boolean true
-d-i passwd/make-user boolean false
-d-i openssh-server/permit-root-login boolean true
-d-i user-setup/allow-password-weak boolean true
-d-i user-setup/encrypt-home boolean false
-tasksel tasksel/first multiselect minimal, ssh-server, openssh-server
-
-d-i preseed/late_command string \
- in-target sed -i 's/PermitRootLogin.*/PermitRootLogin yes/g' /etc/ssh/sshd_config
diff --git a/ubuntu-16.04/template.json b/ubuntu-16.04/template.json
index e36e506..40d49e0 100644
--- a/ubuntu-16.04/template.json
+++ b/ubuntu-16.04/template.json
@@ -154,8 +154,8 @@
" kbd-chooser/method=us<wait>",
" keyboard-configuration/layout=USA<wait>",
" keyboard-configuration/variant=USA<wait>",
- " passwd/root-password={{user `password`}} ",
- " passwd/root-password-again={{user `password`}} ",
+ " passwd/root-password={{ user `password` }} ",
+ " passwd/root-password-again={{ user `password` }} ",
" locale=en_US<wait>",
" netcfg/get_hostname=ubuntu-1604<wait>",
" netcfg/get_domain=cloudlab.cz<wait>",
@@ -172,8 +172,8 @@
"iso_checksum": "10fcd20619dce11fe094e960c85ba4a9",
"iso_checksum_type": "md5",
"iso_url": "http://releases.ubuntu.com/16.04/ubuntu-16.04.3-server-amd64.iso",
- "ssh_username": "{{user `user`}}",
- "ssh_password": "{{user `password`}}",
+ "ssh_username": "{{ user `user` }}",
+ "ssh_password": "{{ user `password` }}",
"ssh_port": 22,
"ssh_wait_timeout": "10000s",
"shutdown_command": "pgrep -f 'sshd: root@' | xargs kill -9 ; shutdown -P now",
@@ -277,7 +277,7 @@
"type": "qemu",
"qemuargs": [
[ "-m", "1024M" ],
- [ "-fda", "config-drive/cloudata.iso" ]
+ [ "-cdrom", "config-drive/cloudata.iso" ]
],
"vm_name": "{{ user `image_name` }}-{{ isotime \"200601021504\" }}",
"output_directory": "images/{{ user `image_name` }}-qemu-{{ isotime \"200601021504\" }}",
@@ -291,8 +291,8 @@
"accelerator": "kvm",
"disk_size": "{{ user `disk_size`}}",
"headless": true,
- "ssh_username": "{{user `user`}}",
- "ssh_password": "{{user `password`}}",
+ "ssh_username": "{{ user `user` }}",
+ "ssh_password": "{{ user `password` }}",
"ssh_host_port_min": 7000,
"ssh_host_port_max": 7050,
"shutdown_command": "pgrep -f 'sshd: root@' | xargs kill -9 ; shutdown -P now",