VMBuilder

Merge lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-oddbloke into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

Proposed by Dan Watkins on 2018-03-13

Status:	Merged
Merged at revision:	796
Proposed branch:	lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-oddbloke
Merge into:	lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm
Diff against target:	17 lines (+2/-2) 1 file modified register-vagrant-version.sh (+2/-2)
To merge this branch:	bzr merge lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-oddbloke
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Philip Roche (community)	2018-03-13	Approve on 2018-03-14
Francis Ginther (community)	2018-03-13	Approve on 2018-03-13
Review via email: [email protected]

Revision history for this message

Francis Ginther (fginther) wrote on 2018-03-13:

Looks good

review: Approve

Revision history for this message

Philip Roche (philroche) on 2018-03-14:

review: Approve

796. By Philip Roche on 2018-03-15

Use HTTPS for Vagrant box redirects (LP: #1754948)

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'register-vagrant-version.sh'
2	--- register-vagrant-version.sh 2017-06-28 19:24:33 +0000
3	+++ register-vagrant-version.sh 2018-03-13 15:24:18 +0000
4	@@ -15,11 +15,11 @@
5	# versions being removed in the future
6	case $SUITE in
7	trusty)
8	- BOX_URL_PREFIX="http://cloud-images.ubuntu.com/vagrant/${SUITE}/current/${SUITE}-server-cloudimg-${ARCH}"
9	+ BOX_URL_PREFIX="https://cloud-images.ubuntu.com/vagrant/${SUITE}/current/${SUITE}-server-cloudimg-${ARCH}"
10	BOX_URL_POSTFIX="-vagrant-disk1.box"
11	;;
12	*)
13	- BOX_URL_PREFIX="http://cloud-images.ubuntu.com/${SUITE}/current/${SUITE}-server-cloudimg-${ARCH}"
14	+ BOX_URL_PREFIX="https://cloud-images.ubuntu.com/${SUITE}/current/${SUITE}-server-cloudimg-${ARCH}"
15	BOX_URL_POSTFIX="-vagrant.box"
16	if [ "${IMAGE_TYPE}" = "juju" ]; then
17	echo "This script does not (yet) support Juju boxes on Xenial and later"