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

[Liam Young]

[uosci-testing-bot (uosci-testing-bot)]

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

=== modified file 'job-parts/osci_openstack_common.sh'
--- job-parts/osci_openstack_common.sh	2015-10-15 04:47:30 +0000
+++ job-parts/osci_openstack_common.sh	2015-11-12 11:48:29 +0000
@@ -98,6 +98,7 @@
   export AMULET_OS_VIP02=$(echo $CIDR_END | sed "s/254/252/g")
   export AMULET_OS_VIP03=$(echo $CIDR_END | sed "s/254/253/g")
   export AMULET_OS_VIP=$AMULET_OS_VIP00
+  export AMULET_ODL_LOCATION='http://10.245.161.162/swift/v1/opendaylight/distribution-karaf-0.2.3-Helium-SR3.tar.gz'
 
   echo "  + Setting network env vars:"
   echo "    NET_ID: $NET_ID"
@@ -110,6 +111,7 @@
   echo "    AMULET_OS_VIP01: $AMULET_OS_VIP01"
   echo "    AMULET_OS_VIP02: $AMULET_OS_VIP02"
   echo "    AMULET_OS_VIP03: $AMULET_OS_VIP03"
+  echo "    AMULET_ODL_LOCATION: $AMULET_ODL_LOCATION"
 }
 
 
 
=== modified file 'populate/mappings.yaml'
--- populate/mappings.yaml	2015-10-22 17:38:08 +0000
+++ populate/mappings.yaml	2015-11-12 11:48:29 +0000
@@ -97,6 +97,9 @@
   - lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
   - lp:~openstack-charmers/charms/trusty/swift-proxy/next
   - lp:~openstack-charmers/charms/trusty/swift-storage/next
+  - lp:~openstack-charmers/charms/trusty/openvswitch-odl/next
+  - lp:~openstack-charmers/charms/trusty/odl-controller/next
+  - lp:~openstack-charmers/charms/trusty/neutron-api-odl/next
   - lp:charms/trusty/ceilometer
   - lp:charms/trusty/ceilometer-agent
   - lp:charms/trusty/ceph