Merge "Use kolla-ansible version to tag images"

This commit is contained in:
Zuul 2019-01-11 16:12:23 +00:00 committed by Gerrit Code Review
commit aab2dd4669

View File

@ -52,12 +52,16 @@ EOF
GATE_IMAGES+=",tacker,mistral,redis,barbican" GATE_IMAGES+=",tacker,mistral,redis,barbican"
fi fi
# Use the kolla-ansible tag rather than the kolla tag, since this is what
# kolla-ansible will use by default.
TAG=$(python -c "import pbr.version; print(pbr.version.VersionInfo('kolla-ansible'))")
cat <<EOF | sudo tee /etc/kolla/kolla-build.conf cat <<EOF | sudo tee /etc/kolla/kolla-build.conf
[DEFAULT] [DEFAULT]
include_header = /etc/kolla/header include_header = /etc/kolla/header
namespace = lokolla namespace = lokolla
base = ${BASE_DISTRO} base = ${BASE_DISTRO}
install_type = ${INSTALL_TYPE} install_type = ${INSTALL_TYPE}
tag = ${TAG}
profile = gate profile = gate
registry = 127.0.0.1:4000 registry = 127.0.0.1:4000
push = true push = true