diff options
| author | Zuul <zuul@review.openstack.org> | 2019-04-15 18:19:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-04-15 18:19:54 +0000 |
| commit | 79b2f9fd04f4e352b1c83bad3969a00f5b852da8 (patch) | |
| tree | f01a30db5a7020d714afa6a41261c5ff9cb30473 | |
| parent | ddab09fdd8d7c08ce8db70948ea12571bb4267a8 (diff) | |
| parent | 92c2456851857c45e8de9a3ff8f167579e0588f4 (diff) | |
| download | kolla-79b2f9fd04f4e352b1c83bad3969a00f5b852da8.tar.gz kolla-79b2f9fd04f4e352b1c83bad3969a00f5b852da8.zip | |
Merge "Write hash after compressing horizon static assets"
| -rw-r--r-- | docker/horizon/extend_start.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 243841b53..7006fafd5 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -3,6 +3,7 @@ set -o errexit FORCE_GENERATE="${FORCE_GENERATE}" +HASH_PATH=/var/lib/kolla/.settings.md5sum.txt # TODO(mgoddard): Remove this elif when Ubuntu has distro_python_version == 3. if [[ ${KOLLA_INSTALL_TYPE} == "binary" ]] && [[ "${KOLLA_BASE_DISTRO}" =~ ubuntu ]]; then @@ -299,11 +300,9 @@ function settings_bundle { function settings_changed { changed=1 - hash_path=/var/lib/kolla/.settings.md5sum.txt - if [[ ! -f $hash_path ]] || ! settings_bundle | md5sum -c --status $hash_path || [[ $FORCE_GENERATE == yes ]]; then + if [[ ! -f $HASH_PATH ]] || ! settings_bundle | md5sum -c --status $HASH_PATH || [[ $FORCE_GENERATE == yes ]]; then changed=0 - settings_bundle | md5sum > $hash_path fi return ${changed} @@ -349,6 +348,7 @@ fi if settings_changed; then ${MANAGE_PY} collectstatic --noinput --clear ${MANAGE_PY} compress --force + settings_bundle | md5sum > $HASH_PATH fi # NOTE(sbezverk) since Horizon is now storing logs in its own location, /var/log/horizon |