Merge "Deperecate apt-mirror element"

This commit is contained in:
Jenkins 2016-08-25 02:56:09 +00:00 committed by Gerrit Code Review
commit 71797b6a59
2 changed files with 10 additions and 0 deletions

View File

@ -0,0 +1,3 @@
if [ -n "${UBUNTU_MIRROR:-}" ]; then
echo "DEPRECATED WARNING: Use of apt-mirror element is deprecated. See http://docs.openstack.org/developer/diskimage-builder/elements/ubuntu/README.html and http://docs.openstack.org/developer/diskimage-builder/elements/apt-sources/README.html for alternate methods of setting an ubuntu mirror."
fi

View File

@ -1,6 +1,13 @@
This element enables the use of a mirror for updating Ubuntu cloud images.
Using a local mirror increases the speed of building the image.
Note: This element is deprectated in favor of the diskimage-builder methods
for setting a mirror. See
http://docs.openstack.org/developer/diskimage-builder/elements/ubuntu/README.html
and
http://docs.openstack.org/developer/diskimage-builder/elements/apt-sources/README.html
for more information.
The Ubuntu mirror URL is specified by setting the 'UBUNTU_MIRROR' environment
variable.