Merge lp:~thomir-deactivatedaccount/core-image-tester/trunk-trim-ssh-setup into lp:core-image-tester

[Thomi Richards]

Remove some features from userdata that we don't need on core images (anything apt-related).

Remove some features from userdata that we don't need on core images (anything apt-related).

[Celso Providelo (cprov)]

Thomi,

Only a minor inline comment ...

review: Approve

[Francis Ginther (fginther)]

Looks good, agree on adding the comment regarding the snappy.ssh_enabled: True

Pro-actively approving.

review: Approve

[lp:~thomir-deactivatedaccount/core-image-tester/trunk-trim-ssh-setup]

34. By Thomi Richards on 2015-04-28

Udpate comment.

=== modified file 'uci-nova'
--- uci-nova	2015-04-27 21:01:48 +0000
+++ uci-nova	2015-04-28 01:17:25 +0000
@@ -191,20 +191,14 @@
         security_setup_neutron
     fi
         
-    # generate cloud-init user data; mostly for manage_etc_hosts, but also get
-    # rid of some unnecessary stuff in the VM
+    # generate cloud-init user data; mostly for manage_etc_hosts and
+    # turning ssh on for core rolling_edge images.
     local userdata=`mktemp`
     cat <<EOF > $userdata
 #cloud-config
 manage_etc_hosts: true
-apt_update: true
-apt_upgrade: false
 snappy:
     ssh_enabled: True
-
-runcmd:
- - echo 'Acquire::Languages "none";' > /etc/apt/apt.conf.d/90nolanguages
- - echo 'force-unsafe-io' > /etc/dpkg/dpkg.cfg.d/autopkgtest
 EOF
 
     EXTRA_OPTS=''