Revision 78e9f209
b/snf-image-helper/snf-image-helper.in | ||
---|---|---|
53 | 53 |
echo "$SNF_IMAGE_PROPERTIES" | |
54 | 54 |
"@scriptsdir@/decode-properties.py" "$properties" |
55 | 55 |
source "$properties" |
56 |
else |
|
57 |
log_error "SNF_IMAGE_PROPERTIES variable is missing" |
|
58 | 56 |
fi |
59 | 57 |
|
60 | 58 |
# Image mount point... |
b/snf-image-host/common.sh.in | ||
---|---|---|
117 | 117 |
log_error "Missing OS API Parameter: OSP_IMG_PASSWD" |
118 | 118 |
exit 1 |
119 | 119 |
fi |
120 |
if [ -z "$OSP_IMG_PROPERTIES" ]; then |
|
121 |
log_error "Missing OS API Parameter: OSP_IMG_PROPERTIES" |
|
122 |
exit 1 |
|
123 |
fi |
|
124 | 120 |
|
125 | 121 |
IMG_ID=$OSP_IMG_ID |
126 | 122 |
IMG_FORMAT=$OSP_IMG_FORMAT |
127 | 123 |
IMG_PASSWD=$OSP_IMG_PASSWD |
128 |
IMG_PROPERTIES=$OSP_IMG_PROPERTIES |
|
124 |
if [ -n "$OSP_IMG_PROPERTIES" ] |
|
125 |
IMG_PROPERTIES="$OSP_IMG_PROPERTIES" |
|
126 |
fi |
|
129 | 127 |
if [ -n "$OSP_IMG_PERSONALITY" ]; then |
130 |
IMG_PERSONALITY=$OSP_IMG_PERSONALITY
|
|
128 |
IMG_PERSONALITY="$OSP_IMG_PERSONALITY"
|
|
131 | 129 |
fi |
132 | 130 |
} |
133 | 131 |
|
b/snf-image-host/create | ||
---|---|---|
93 | 93 |
snf_export_TYPE="$IMG_FORMAT" |
94 | 94 |
snf_export_PASSWORD="$IMG_PASSWD" |
95 | 95 |
snf_export_HOSTNAME="$instance" |
96 |
snf_export_PROPERTIES="$IMG_PROPERTIES" |
|
96 |
if [ -n "$IMG_PROPERTIES" ] |
|
97 |
snf_export_PROPERTIES="$IMG_PROPERTIES" |
|
98 |
fi |
|
97 | 99 |
if [ -n "$IMG_PERSONALITY" ]; then |
98 | 100 |
snf_export_PERSONALITY="$IMG_PERSONALITY" |
99 | 101 |
fi |
Also available in: Unified diff