VMBuilder

Merge lp:~adeuring/vmbuilder/jenkins_kvm-juju-gui-use-port-6079 into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

  1. jenkins_kvm-juju-gui-use-port-6079
  2. Merge into jenkins_kvm
Proposed by Abel Deuring
Status: Merged
Merge reported by: Abel Deuring
Merged at revision: not available
Proposed branch: lp:~adeuring/vmbuilder/jenkins_kvm-juju-gui-use-port-6079
Merge into: lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm
Diff against target: 20 lines (+2/-2)
1 file modified
jenkins/CloudImages_Juju.sh (+2/-2)
To merge this branch: bzr merge lp:~adeuring/vmbuilder/jenkins_kvm-juju-gui-use-port-6079
Reviewer Review Type Date Requested Status
Ben Howard (community) cpc merge Approve
Review via email: mp+229928@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ben Howard (darkmuggle-deactivatedaccount) wrote :

Merged.

review: Approve (cpc merge)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'jenkins/CloudImages_Juju.sh'
2--- jenkins/CloudImages_Juju.sh 2014-07-25 21:33:25 +0000
3+++ jenkins/CloudImages_Juju.sh 2014-08-07 12:28:43 +0000
4@@ -153,7 +153,7 @@
5 cat << EOF > ${WORKSPACE}/box/Vagrantfile
6 \$script = <<SCRIPT
7 bzr branch lp:jujuredirector/quickstart /tmp/jujuredir
8-bash /tmp/jujuredir/setup-juju.sh
9+bash /tmp/jujuredir/setup-juju.sh 6079
10 SCRIPT
11
12 Vagrant.configure("2") do |config|
13@@ -164,7 +164,7 @@
14 config.vm.base_mac = "${macaddr}"
15 config.vm.network :forwarded_port, guest: 22, host: 2122, host_ip: "127.0.0.1"
16 config.vm.network :forwarded_port, guest: 80, host: 6080, host_ip: "127.0.0.1"
17- config.vm.network :forwarded_port, guest: 8001, host: 8001, host_ip: "127.0.0.1"
18+ config.vm.network :forwarded_port, guest: 6079, host: 6079, host_ip: "127.0.0.1"
19 config.vm.network "private_network", ip: "172.16.250.15"
20 config.vm.provision "shell", inline: \$script
21

Subscribers

People subscribed via source and target branches