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

Proposed by Dan Watkins
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
Reviewer Review Type Date Requested Status
Philip Roche Approve
Francis Ginther (community) Approve
Review via email: mp+341339@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Francis Ginther (fginther) wrote :

Looks good

review: Approve
Revision history for this message
Philip Roche (philroche) :
review: Approve
796. By Philip Roche

Merge lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-oddbloke into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm [a=daniel-thewatkins] [r=fginther,philroche]

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

MP: https://code.launchpad.net/~ubuntu-on-ec2/vmbuilder/jenkins_kvm-oddbloke/+merge/341339

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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"

Subscribers

People subscribed via source and target branches

to all changes: