]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
buildpackages: copy teuthology user-data.txt changes
authorRobin H. Johnson <robin.johnson@dreamhost.com>
Thu, 10 Dec 2015 19:55:56 +0000 (11:55 -0800)
committerLoic Dachary <ldachary@redhat.com>
Sat, 12 Dec 2015 13:53:14 +0000 (14:53 +0100)
7b27e1db7: openstack: support /etc/network/intefaces injection
2358562cf: ensure VMs always have /etc/hosts set up
4378a505d: always allow unsigned deb packages
50b2db521: openstack: encode instance name with the full IP
6e828a33b: openstack: add 8.8.8.8 as a last resort resolver

Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
(cherry picked from commit 89bde0b8fe9361131bf86ae4f07ae2e4587a00b2)

tasks/buildpackages/user-data.txt

index 03fc7c971382983724177ac5a5d295ee2b069b69..f30995d5c983bbee3e2e207b37df2a1107145007 100644 (file)
@@ -1,4 +1,9 @@
 #cloud-config
+bootcmd:
+ - echo 'APT::Get::AllowUnauthenticated "true";' | tee /etc/apt/apt.conf.d/99disablesigs
+ - echo nameserver 8.8.8.8 | sudo tee -a /etc/resolv.conf # last resort, in case the DHCP server does not provide a resolver
+manage_etc_hosts: true
+preserve_hostname: true
 system_info:
   default_user:
     name: ubuntu