sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debian: dont set always the hostname to debian

Browse Source 
If we dont force the hostname to be debian, the hostname will
be the one choosen when creating the instance with horizon

This bug was introduced when the debian element was split
into debian and debian-minimal and debootstrap in commit 23aa76df

Change-Id: I007a3531f6876890a2e113082211889ec5ead1a1
This commit is contained in:
Saverio Proto 2015-07-21 10:25:54 +02:00
parent 352e58ceb7
commit 0d364d49cf
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
elements/debian/install.d/10-cloud-opinions
View File

@ -37,10 +37,3 @@ if [ "$DIB_DEBIAN_ALT_INIT_PACKAGE" != "sysvinit" ]; then
/etc/apt/preferences.d/sysvinit > /etc/apt/preferences.d/sysvinit /etc/apt/preferences.d/sysvinit > /etc/apt/preferences.d/sysvinit
fi fi
# Since Jessie, when either 'hostname' or 'fqdn' are in a config file, it
# considers them as authoritative and would only use cloud meta data as a
# fallback.
if [ "$DIB_RELEASE" = 'wheezy' ]; then
# specify a hostname so that cloud-init does not default to (None)
echo 'hostname: debian' > /etc/cloud/cloud.cfg.d/01_hostname.cfg
fi