From 468d57391abd10e2891865e58c920ba8ce1e4511 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Thu, 9 Mar 2017 13:43:28 -0600 Subject: [PATCH] modfiied to use the openstack-db Change-Id: I5af37e835db147c59ed091a37f1c1f0412e24e3a Signed-off-by: Narinder Gupta --- ci/config_tpl/juju2/bundle_tpl/odl.yaml | 2 +- ci/odl/fetch-charms.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/config_tpl/juju2/bundle_tpl/odl.yaml b/ci/config_tpl/juju2/bundle_tpl/odl.yaml index 5580449f..472efc3c 100644 --- a/ci/config_tpl/juju2/bundle_tpl/odl.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/odl.yaml @@ -14,7 +14,7 @@ {% elif os.network.odll3 %} profile: "openvswitch-odl-beryllium-l3" {% else %} - profile: "openvswitch-odl-boron" + profile: "openvswitch-odl-beryllium" {% endif %} http-proxy: "http://squid.internal:3128" https-proxy: "http://squid.internal:3128" diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh index 86d2b51f..bf9b44ff 100755 --- a/ci/odl/fetch-charms.sh +++ b/ci/odl/fetch-charms.sh @@ -69,7 +69,7 @@ charm pull cs:~cloudscaling/scaleio-gui $distro/scaleio-gui #odl controller specific charm charm pull cs:$distro/odl-controller $distro/odl-controller -charm pull cs:~narindergupta/neutron-api-odl-8 $distro/neutron-api-odl -charm pull cs:~narindergupta/openvswitch-odl-2 $distro/openvswitch-odl -charm pull cs:~narindergupta/neutron-gateway-3 $distro/neutron-gateway +charm pull cs:~narindergupta/neutron-api-odl-11 $distro/neutron-api-odl +charm pull cs:~narindergupta/openvswitch-odl-3 $distro/openvswitch-odl +charm pull cs:~narindergupta/neutron-gateway-5 $distro/neutron-gateway charm pull cs:~narindergupta/congress-0 $distro/congress -- 2.16.6