openstack
/
octavia
Code Issues Proposed changes

Merge "Add cloud-init-datasources DIB element"

This commit is contained in:
Zuul 2019-07-23 00:01:05 +00:00 committed by Gerrit Code Review
parent 45cf2f328f b12e5bb25e
commit 2363a929f3
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