Merge lp:~gnuoy/ubuntu-openstack-ci/odl into lp:ubuntu-openstack-ci

Proposed by Liam Young on 2015-11-12
Status: Merged
Merged at revision: 183
Proposed branch: lp:~gnuoy/ubuntu-openstack-ci/odl
Merge into: lp:ubuntu-openstack-ci
Diff against target: 33 lines (+5/-0)
2 files modified
job-parts/osci_openstack_common.sh (+2/-0)
populate/mappings.yaml (+3/-0)
To merge this branch: bzr merge lp:~gnuoy/ubuntu-openstack-ci/odl
Reviewer Review Type Date Requested Status
Ryan Beisner 2015-11-12 Approve on 2015-11-12
Review via email: mp+277327@code.launchpad.net
To post a comment you must log in.

charm_lint_check #13485 lp:ubuntu-openstack-ci for gnuoy mp277327
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/13485/

Ryan Beisner (1chb1n) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'job-parts/osci_openstack_common.sh'
2--- job-parts/osci_openstack_common.sh 2015-10-15 04:47:30 +0000
3+++ job-parts/osci_openstack_common.sh 2015-11-12 11:48:29 +0000
4@@ -98,6 +98,7 @@
5 export AMULET_OS_VIP02=$(echo $CIDR_END | sed "s/254/252/g")
6 export AMULET_OS_VIP03=$(echo $CIDR_END | sed "s/254/253/g")
7 export AMULET_OS_VIP=$AMULET_OS_VIP00
8+ export AMULET_ODL_LOCATION='http://10.245.161.162/swift/v1/opendaylight/distribution-karaf-0.2.3-Helium-SR3.tar.gz'
9
10 echo " + Setting network env vars:"
11 echo " NET_ID: $NET_ID"
12@@ -110,6 +111,7 @@
13 echo " AMULET_OS_VIP01: $AMULET_OS_VIP01"
14 echo " AMULET_OS_VIP02: $AMULET_OS_VIP02"
15 echo " AMULET_OS_VIP03: $AMULET_OS_VIP03"
16+ echo " AMULET_ODL_LOCATION: $AMULET_ODL_LOCATION"
17 }
18
19
20
21=== modified file 'populate/mappings.yaml'
22--- populate/mappings.yaml 2015-10-22 17:38:08 +0000
23+++ populate/mappings.yaml 2015-11-12 11:48:29 +0000
24@@ -97,6 +97,9 @@
25 - lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
26 - lp:~openstack-charmers/charms/trusty/swift-proxy/next
27 - lp:~openstack-charmers/charms/trusty/swift-storage/next
28+ - lp:~openstack-charmers/charms/trusty/openvswitch-odl/next
29+ - lp:~openstack-charmers/charms/trusty/odl-controller/next
30+ - lp:~openstack-charmers/charms/trusty/neutron-api-odl/next
31 - lp:charms/trusty/ceilometer
32 - lp:charms/trusty/ceilometer-agent
33 - lp:charms/trusty/ceph

Subscribers

People subscribed via source and target branches