From f5c1549ebd2e81e95d52c767e75d60e0e167451b Mon Sep 17 00:00:00 2001 From: Gregory Haynes Date: Mon, 22 Aug 2016 17:27:40 +0000 Subject: [PATCH] Deperecate apt-mirror element There are upstream methods for setting a mirror which are much more flexible, lets just document and point users at them. Change-Id: I442e4695d56086932403fb5893da89ead203c86d --- elements/apt-mirror/10-deprecate-apt-mirror | 3 +++ elements/apt-mirror/README.rst | 7 +++++++ 2 files changed, 10 insertions(+) create mode 100644 elements/apt-mirror/10-deprecate-apt-mirror diff --git a/elements/apt-mirror/10-deprecate-apt-mirror b/elements/apt-mirror/10-deprecate-apt-mirror new file mode 100644 index 0000000000..ce4cc41956 --- /dev/null +++ b/elements/apt-mirror/10-deprecate-apt-mirror @@ -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 diff --git a/elements/apt-mirror/README.rst b/elements/apt-mirror/README.rst index c4259092af..dd2ca99de8 100644 --- a/elements/apt-mirror/README.rst +++ b/elements/apt-mirror/README.rst @@ -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.