airship
/
maas
Code Issues Proposed changes

[Fix] Remove the check for rack sync images 

Since Drydock checks for image sync before node deployment
this check is not needed.

Change-Id: I4ca3c5e9c179cce0a0d50df5e29b3466b1126054
This commit is contained in:
anthony.bellino 2019-05-30 19:50:26 +00:00
parent 3b453bd8d6
commit ce4a4404d7
1 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
charts/maas/templates/bin/_import-boot-resources.sh.tpl
View File

@ -89,33 +89,6 @@ function check_then_set {
fi
}
function check_for_rack_sync {
sync_list=""
while [[ ${JOB_TIMEOUT} -gt 0 ]]
do
rack_list=$(maas ${ADMIN_USERNAME} rack-controllers read | tail -n +1 | jq -r '.[] | .system_id')
for rack_id in ${rack_list}
do
selected_imgs=$(maas ${ADMIN_USERNAME} rack-controller list-boot-images ${rack_id} | tail -n +1 | jq ".images[] | select( .name | contains(\"${MAAS_DEFAULT_DISTRO}\")) | .name")
synced_ctlr=$(maas ${ADMIN_USERNAME} rack-controller list-boot-images ${rack_id} | tail -n +1 | jq '.status == "synced"')
if [[ $synced_ctlr == "true" && ! -z ${selected_imgs} ]]
then
sync_list=$(echo -e "${sync_list}\n${rack_id}" | sort | uniq)
else
maas ${ADMIN_USERNAME} rack-controller import-boot-images ${rack_id}
fi
if [[ $(echo -e "${rack_list}" | sort | uniq | grep -v '^$' ) == $(echo -e "${sync_list}" | sort | uniq | grep -v '^$') ]]
then
return 0
fi
done
let JOB_TIMEOUT-=${RETRY_TIMER}
sleep ${RETRY_TIMER}
done
return 1
}
function configure_proxy {
check_then_set enable_http_proxy ${MAAS_PROXY_ENABLED}
check_then_set use_peer_proxy ${MAAS_PEER_PROXY_ENABLED}
@ -134,7 +107,6 @@ function configure_dns {
}
function configure_images {
check_for_rack_sync
if [[ $? -eq 1 ]]
then