Julian Edwards has proposed merging lp:~julian-edwards/maas/mipf-images-mirror into lp:maas.
Commit message: Make maas-import-* mirror settings settable via environment variables. Requested reviews: Launchpad code reviewers (launchpad-reviewers) For more details, see: https://code.launchpad.net/~julian-edwards/maas/mipf-images-mirror/+merge/132680 -- https://code.launchpad.net/~julian-edwards/maas/mipf-images-mirror/+merge/132680 Your team Launchpad code reviewers is requested to review the proposed merge of lp:~julian-edwards/maas/mipf-images-mirror into lp:maas.
=== modified file 'scripts/maas-import-ephemerals' --- scripts/maas-import-ephemerals 2012-10-09 11:40:35 +0000 +++ scripts/maas-import-ephemerals 2012-11-02 11:15:30 +0000 @@ -20,7 +20,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. VERBOSITY=0 -REMOTE_IMAGES_MIRROR="https://maas.ubuntu.com/images"; +REMOTE_IMAGES_MIRROR=${REMOTE_IMAGES_MIRROR:-https://maas.ubuntu.com/images} # iSCSI targets configuration file. SYS_TGT_CONF="/etc/tgt/targets.conf" === modified file 'scripts/maas-import-pxe-files' --- scripts/maas-import-pxe-files 2012-10-03 15:04:35 +0000 +++ scripts/maas-import-pxe-files 2012-11-02 11:15:30 +0000 @@ -21,8 +21,8 @@ [ -r $local_settings ] && . $local_settings # Download locations for Ubuntu releases. -MAIN_ARCHIVE=${ARCHIVE:-http://archive.ubuntu.com/ubuntu/} -PORTS_ARCHIVE=${ARCHIVE:-http://ports.ubuntu.com/ubuntu-ports/} +MAIN_ARCHIVE=${MAIN_ARCHIVE:-http://archive.ubuntu.com/ubuntu/} +PORTS_ARCHIVE=${PORTS_ARCHIVE:-http://ports.ubuntu.com/ubuntu-ports/} # Ubuntu releases that are to be downloaded. SUPPORTED_RELEASES=$(distro-info --supported) === modified file 'src/provisioningserver/tests/test_maas_import_pxe_files.py' --- src/provisioningserver/tests/test_maas_import_pxe_files.py 2012-09-29 03:12:23 +0000 +++ src/provisioningserver/tests/test_maas_import_pxe_files.py 2012-11-02 11:15:30 +0000 @@ -153,7 +153,8 @@ path = [os.path.join(root, "bin"), os.path.join(root, "scripts")] path.extend(os.environ.get("PATH", "").split(os.pathsep)) env = { - 'ARCHIVE': 'file://%s' % archive_dir, + 'MAIN_ARCHIVE': 'file://%s' % archive_dir, + 'PORTS_ARCHIVE': 'file://%s' % archive_dir, # Substitute curl for wget; it accepts file:// URLs. 'DOWNLOAD': 'curl -O --silent', 'PATH': os.pathsep.join(path),
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
