openstack
/
octavia
Code Issues Proposed changes

Add cloud-init-datasources DIB element 

The cloud-init-datasources DIB element configures cloud-init to only use
an explicit list of data sources. Until the switch from ubuntu element
to ubuntu-minimal, cloud-init was being configured to only use
ConfigDrive datasource because the ubuntu element had
cloud-init-datasources as element dependency. The ubuntu-minimal and
other OS elements (e.g. RHEL-based) do not have it, so the export
DIB_CLOUD_INIT_DATASOURCES was not being used.

Change-Id: I74ecc826596c5f739a49defe6588bcc741b03594
This commit is contained in:
Carlos Goncalves 2019-07-16 13:50:16 +02:00
parent e3aacb67ad
commit b12e5bb25e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
diskimage-create/diskimage-create.sh
View File

@ -382,6 +382,7 @@ AMP_element_sequence="$AMP_element_sequence rebind-sshd"
AMP_element_sequence="$AMP_element_sequence no-resolvconf"
AMP_element_sequence="$AMP_element_sequence amphora-agent"
AMP_element_sequence="$AMP_element_sequence sos"
AMP_element_sequence="$AMP_element_sequence cloud-init-datasources"
if [ "$AMP_ENABLE_FULL_MAC_SECURITY" -ne 1 ]; then
# SELinux systems
@ -416,9 +417,7 @@ fi
# Build the image
if [ "$AMP_BASEOS" = "ubuntu-minimal" ]; then
export DIB_CLOUD_INIT_DATASOURCES=$CLOUD_INIT_DATASOURCES
fi
export DIB_CLOUD_INIT_DATASOURCES=$CLOUD_INIT_DATASOURCES
dib_trace_arg=
if [ -n "$dib_enable_tracing" ]; then