sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
0208f83a97
diskimage-builder/diskimage_builder/elements/base/install.d/10-cloud-init

18 lines
368 B
Plaintext
Raw Normal View History

Add a flavour for doing generic this-node-is-in-a-cloud stuff, like cloud-init tweaks.
2012-11-13 02:34:29 +00:00
#!/bin/bash
# Tweak the stock ubuntu cloud-init config
Standarise tracing for scripts There is a wide variety of tracing options through the various shell scripts. Some use "set -eux", others explicity set xtrace and others do nothing. There is a "-x" option to bin/disk-image-create but it doesn't flow down to the many scripts it calls. This adds a global integer variable set by disk-image-create DIB_DEBUG_TRACE. All scripts have a stanza added to detect this and turn on tracing. Any other tracing methods are rolled into this. So the standard header is --- if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then set -x fi set -eu set -o pipefail --- Multiple -x options can be specified to dib-create-image, which increases the value of DIB_DEBUG_TRACE. If script authors feel their script should only trace at higher levels, they should modify the "-gt" value. If they feel it should trace by default, they can modify the default value also. Changes to pachset 16 : scripts which currently trace themselves by default have retained this behaviour with DIB_DEBUG_TRACE defaulting to "1". This was done by running [1] on patch set 15. See the thread beginning at [2] dib-lint is also updated to look for the variable being matched. [1] https://gist.github.com/ianw/71bbda9e6acc74ccd0fd [2] http://lists.openstack.org/pipermail/openstack-dev/2014-November/051575.html Change-Id: I6c5a962260741dcf6f89da9a33b96372a719b7b0
2014-09-04 04:56:29 +00:00
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
set -x
fi
set -u and -o pipefail everywhere As with the previous similar changes, this is intended to catch problems as they happen instead of ignoring them and continuing on to potentially fail later. Setting this on all existing scripts will allow us to enforce use via Jenkins. Change-Id: Iad2d490c86dceab148ea9ab08f457c49a5d5352e
2014-04-03 02:24:15 +00:00
set -eu
set -o pipefail
Add a flavour for doing generic this-node-is-in-a-cloud stuff, like cloud-init tweaks.
2012-11-13 02:34:29 +00:00
Handle non-cloud-init installs Not all operating-system elements install cloud-init, but the base element assumes its existence. Create the directory if it does not exist. Change-Id: I4bda8dc5d200825ea0c8163a4e5c44050a45083f
2015-03-23 20:14:07 +00:00
# cloud-init May not actually be installed
mkdir -p /etc/cloud/cloud.cfg.d
Make managing hosts entries optional Diskimage-builder currently writes cloud-init config file which adds a host entry mapping the hostname and FQDN to 127.0.0.1 into every image built. This is probably useful for some use cases but not for all, so we now allow customizing the manage_etc_hosts value via DIB_CLOUD_INIT_ETC_HOSTS variable and also not writing the config at all if that variable is explicitly set to an empty string (currently the default is 'localhost' but in the future the default will be empty string). Particular description of the problem this causes in TripleO follows: We get hosts files like this: ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 127.0.0.1 ov-rl5i5saoc6h-1-hj5tzsbrdv4c-controller-dy6nuyarqy5z.novalocal ov-rl5i5saoc6h-1-hj5tzsbrdv4c-controller-dy6nuyarqy5z # HEAT_HOSTS_START - Do not edit manually within this section! 192.0.2.17 ov-rl5i5saoc6h-0-wfzcsrqo34p6-controller-m3hy26lhxavl ov-rl5i5saoc6h-0-wfzcsrqo34p6-controller-m3hy26lhxavl.novalocal 192.0.2.15 ov-rl5i5saoc6h-1-hj5tzsbrdv4c-controller-dy6nuyarqy5z ov-rl5i5saoc6h-1-hj5tzsbrdv4c-controller-dy6nuyarqy5z.novalocal 192.0.2.16 ov-rl5i5saoc6h-2-a6v7saxnivm5-controller-7jboskte34r7 ov-rl5i5saoc6h-2-a6v7saxnivm5-controller-7jboskte34r7.novalocal # HEAT_HOSTS_END The duplicate hostname/FQDN entry for 127.0.0.1 and 192.0.2.15 confuses Corosync, which then fails to start a cluster when using hostnames in the config file instead of IPs. Change-Id: Ia8582883f737548e2911d3f36a1943e5b236281b Partial-Bug: #1447497
2015-04-24 11:32:36 +00:00
Remove deprecated overriding of cloud-init defaults The "set to localhost by default" behavior for manage_etc_hosts has been deprecated for more than a year now by change Ia8582883f737548e2911d3f36a1943e5b236281b. Setting that value to "localhost" is still possible, but it won't be the default anymore. If the previous behavior of assigning the hostname and FQDN to 127.0.0.1 is still desired in some environments, it can be achieved by setting the DIB_CLOUD_INIT_ETC_HOSTS environment variable, as the deprecation warning message suggested. Change-Id: I5a19d46e2f305769a0c89c9d25d2e6be02910221
2016-05-23 15:44:32 +00:00
if [ -n "${DIB_CLOUD_INIT_ETC_HOSTS:-}" ]; then
Make managing hosts entries optional Diskimage-builder currently writes cloud-init config file which adds a host entry mapping the hostname and FQDN to 127.0.0.1 into every image built. This is probably useful for some use cases but not for all, so we now allow customizing the manage_etc_hosts value via DIB_CLOUD_INIT_ETC_HOSTS variable and also not writing the config at all if that variable is explicitly set to an empty string (currently the default is 'localhost' but in the future the default will be empty string). Particular description of the problem this causes in TripleO follows: We get hosts files like this: ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 127.0.0.1 ov-rl5i5saoc6h-1-hj5tzsbrdv4c-controller-dy6nuyarqy5z.novalocal ov-rl5i5saoc6h-1-hj5tzsbrdv4c-controller-dy6nuyarqy5z # HEAT_HOSTS_START - Do not edit manually within this section! 192.0.2.17 ov-rl5i5saoc6h-0-wfzcsrqo34p6-controller-m3hy26lhxavl ov-rl5i5saoc6h-0-wfzcsrqo34p6-controller-m3hy26lhxavl.novalocal 192.0.2.15 ov-rl5i5saoc6h-1-hj5tzsbrdv4c-controller-dy6nuyarqy5z ov-rl5i5saoc6h-1-hj5tzsbrdv4c-controller-dy6nuyarqy5z.novalocal 192.0.2.16 ov-rl5i5saoc6h-2-a6v7saxnivm5-controller-7jboskte34r7 ov-rl5i5saoc6h-2-a6v7saxnivm5-controller-7jboskte34r7.novalocal # HEAT_HOSTS_END The duplicate hostname/FQDN entry for 127.0.0.1 and 192.0.2.15 confuses Corosync, which then fails to start a cluster when using hostnames in the config file instead of IPs. Change-Id: Ia8582883f737548e2911d3f36a1943e5b236281b Partial-Bug: #1447497
2015-04-24 11:32:36 +00:00
dd of=/etc/cloud/cloud.cfg.d/10_etc_hosts.cfg << EOF
manage_etc_hosts: $DIB_CLOUD_INIT_ETC_HOSTS
Add a flavour for doing generic this-node-is-in-a-cloud stuff, like cloud-init tweaks.
2012-11-13 02:34:29 +00:00
EOF
Make managing hosts entries optional Diskimage-builder currently writes cloud-init config file which adds a host entry mapping the hostname and FQDN to 127.0.0.1 into every image built. This is probably useful for some use cases but not for all, so we now allow customizing the manage_etc_hosts value via DIB_CLOUD_INIT_ETC_HOSTS variable and also not writing the config at all if that variable is explicitly set to an empty string (currently the default is 'localhost' but in the future the default will be empty string). Particular description of the problem this causes in TripleO follows: We get hosts files like this: ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 127.0.0.1 ov-rl5i5saoc6h-1-hj5tzsbrdv4c-controller-dy6nuyarqy5z.novalocal ov-rl5i5saoc6h-1-hj5tzsbrdv4c-controller-dy6nuyarqy5z # HEAT_HOSTS_START - Do not edit manually within this section! 192.0.2.17 ov-rl5i5saoc6h-0-wfzcsrqo34p6-controller-m3hy26lhxavl ov-rl5i5saoc6h-0-wfzcsrqo34p6-controller-m3hy26lhxavl.novalocal 192.0.2.15 ov-rl5i5saoc6h-1-hj5tzsbrdv4c-controller-dy6nuyarqy5z ov-rl5i5saoc6h-1-hj5tzsbrdv4c-controller-dy6nuyarqy5z.novalocal 192.0.2.16 ov-rl5i5saoc6h-2-a6v7saxnivm5-controller-7jboskte34r7 ov-rl5i5saoc6h-2-a6v7saxnivm5-controller-7jboskte34r7.novalocal # HEAT_HOSTS_END The duplicate hostname/FQDN entry for 127.0.0.1 and 192.0.2.15 confuses Corosync, which then fails to start a cluster when using hostnames in the config file instead of IPs. Change-Id: Ia8582883f737548e2911d3f36a1943e5b236281b Partial-Bug: #1447497
2015-04-24 11:32:36 +00:00
fi
Reference in New Issue Copy Permalink