Change-Id: If73435968cfbd0dd3cc519f0a30e02bec5fcb386
| ... | ... |
@@ -1018,7 +1018,7 @@ if is_service_enabled nova && is_baremetal; then |
| 1018 | 1018 |
prepare_baremetal_toolchain |
| 1019 | 1019 |
configure_baremetal_nova_dirs |
| 1020 | 1020 |
if [[ "$BM_USE_FAKE_ENV" = "True" ]]; then |
| 1021 |
- create_fake_baremetal_env |
|
| 1021 |
+ create_fake_baremetal_env |
|
| 1022 | 1022 |
fi |
| 1023 | 1023 |
fi |
| 1024 | 1024 |
|
| ... | ... |
@@ -1180,26 +1180,26 @@ if is_service_enabled g-reg; then |
| 1180 | 1180 |
die_if_not_set $LINENO TOKEN "Keystone fail to get token" |
| 1181 | 1181 |
|
| 1182 | 1182 |
if is_baremetal; then |
| 1183 |
- echo_summary "Creating and uploading baremetal images" |
|
| 1183 |
+ echo_summary "Creating and uploading baremetal images" |
|
| 1184 | 1184 |
|
| 1185 |
- # build and upload separate deploy kernel & ramdisk |
|
| 1186 |
- upload_baremetal_deploy $TOKEN |
|
| 1185 |
+ # build and upload separate deploy kernel & ramdisk |
|
| 1186 |
+ upload_baremetal_deploy $TOKEN |
|
| 1187 | 1187 |
|
| 1188 |
- # upload images, separating out the kernel & ramdisk for PXE boot |
|
| 1189 |
- for image_url in ${IMAGE_URLS//,/ }; do
|
|
| 1190 |
- upload_baremetal_image $image_url $TOKEN |
|
| 1191 |
- done |
|
| 1188 |
+ # upload images, separating out the kernel & ramdisk for PXE boot |
|
| 1189 |
+ for image_url in ${IMAGE_URLS//,/ }; do
|
|
| 1190 |
+ upload_baremetal_image $image_url $TOKEN |
|
| 1191 |
+ done |
|
| 1192 | 1192 |
else |
| 1193 |
- echo_summary "Uploading images" |
|
| 1193 |
+ echo_summary "Uploading images" |
|
| 1194 | 1194 |
|
| 1195 |
- # Option to upload legacy ami-tty, which works with xenserver |
|
| 1196 |
- if [[ -n "$UPLOAD_LEGACY_TTY" ]]; then |
|
| 1197 |
- IMAGE_URLS="${IMAGE_URLS:+${IMAGE_URLS},}https://github.com/downloads/citrix-openstack/warehouse/tty.tgz"
|
|
| 1198 |
- fi |
|
| 1195 |
+ # Option to upload legacy ami-tty, which works with xenserver |
|
| 1196 |
+ if [[ -n "$UPLOAD_LEGACY_TTY" ]]; then |
|
| 1197 |
+ IMAGE_URLS="${IMAGE_URLS:+${IMAGE_URLS},}https://github.com/downloads/citrix-openstack/warehouse/tty.tgz"
|
|
| 1198 |
+ fi |
|
| 1199 | 1199 |
|
| 1200 |
- for image_url in ${IMAGE_URLS//,/ }; do
|
|
| 1201 |
- upload_image $image_url $TOKEN |
|
| 1202 |
- done |
|
| 1200 |
+ for image_url in ${IMAGE_URLS//,/ }; do
|
|
| 1201 |
+ upload_image $image_url $TOKEN |
|
| 1202 |
+ done |
|
| 1203 | 1203 |
fi |
| 1204 | 1204 |
fi |
| 1205 | 1205 |
|
| ... | ... |
@@ -1211,7 +1211,7 @@ fi |
| 1211 | 1211 |
if is_service_enabled nova && is_baremetal; then |
| 1212 | 1212 |
# create special flavor for baremetal if we know what images to associate |
| 1213 | 1213 |
[[ -n "$BM_DEPLOY_KERNEL_ID" ]] && [[ -n "$BM_DEPLOY_RAMDISK_ID" ]] && \ |
| 1214 |
- create_baremetal_flavor $BM_DEPLOY_KERNEL_ID $BM_DEPLOY_RAMDISK_ID |
|
| 1214 |
+ create_baremetal_flavor $BM_DEPLOY_KERNEL_ID $BM_DEPLOY_RAMDISK_ID |
|
| 1215 | 1215 |
|
| 1216 | 1216 |
# otherwise user can manually add it later by calling nova-baremetal-manage |
| 1217 | 1217 |
[[ -n "$BM_FIRST_MAC" ]] && add_baremetal_node |
| ... | ... |
@@ -1233,7 +1233,7 @@ fi |
| 1233 | 1233 |
CURRENT_RUN_TIME=$(date "+$TIMESTAMP_FORMAT") |
| 1234 | 1234 |
echo "# $CURRENT_RUN_TIME" >$TOP_DIR/.stackenv |
| 1235 | 1235 |
for i in BASE_SQL_CONN ENABLED_SERVICES HOST_IP LOGFILE \ |
| 1236 |
- SERVICE_HOST SERVICE_PROTOCOL STACK_USER TLS_IP; do |
|
| 1236 |
+ SERVICE_HOST SERVICE_PROTOCOL STACK_USER TLS_IP; do |
|
| 1237 | 1237 |
echo $i=${!i} >>$TOP_DIR/.stackenv
|
| 1238 | 1238 |
done |
| 1239 | 1239 |
|