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

Proposed by Thomi Richards
Status: Merged
Approved by: Thomi Richards
Approved revision: 34
Merged at revision: 33
Proposed branch: lp:~thomir-deactivatedaccount/core-image-tester/trunk-trim-ssh-setup
Merge into: lp:core-image-tester
Diff against target: 26 lines (+2/-8)
1 file modified
uci-nova (+2/-8)
To merge this branch: bzr merge lp:~thomir-deactivatedaccount/core-image-tester/trunk-trim-ssh-setup
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Celso Providelo (community) Approve
Review via email: mp+257589@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Celso Providelo (cprov) wrote :

Thomi,

Only a minor inline comment ...

review: Approve
Francis Ginther (fginther) wrote :

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

Pro-actively approving.

review: Approve
34. By Thomi Richards on 2015-04-28

Udpate comment.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'uci-nova'
2--- uci-nova 2015-04-27 21:01:48 +0000
3+++ uci-nova 2015-04-28 01:17:25 +0000
4@@ -191,20 +191,14 @@
5 security_setup_neutron
6 fi
7
8- # generate cloud-init user data; mostly for manage_etc_hosts, but also get
9- # rid of some unnecessary stuff in the VM
10+ # generate cloud-init user data; mostly for manage_etc_hosts and
11+ # turning ssh on for core rolling_edge images.
12 local userdata=`mktemp`
13 cat <<EOF > $userdata
14 #cloud-config
15 manage_etc_hosts: true
16-apt_update: true
17-apt_upgrade: false
18 snappy:
19 ssh_enabled: True
20-
21-runcmd:
22- - echo 'Acquire::Languages "none";' > /etc/apt/apt.conf.d/90nolanguages
23- - echo 'force-unsafe-io' > /etc/dpkg/dpkg.cfg.d/autopkgtest
24 EOF
25
26 EXTRA_OPTS=''

Subscribers

People subscribed via source and target branches

to all changes: