configure VLAN on interface in MAAS.

[joid.git] / ci / odl / fetch-charms.sh

diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index 606b126..ff4886e 100755 (executable)
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -13,15 +13,15 @@ function build {
 bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
 bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb
 bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp
+charm pull cs:~narindergupta/neutron-gateway-0 $distro/neutron-gateway
 
 git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
 build congress
 
-git clone  https://github.com/openstack/charm-hacluster.git $distro/hacluster
+git clone https://github.com/openstack/charm-hacluster.git $distro/hacluster
 git clone  https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
 git clone  https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
-git clone  https://github.com/openstack/charm-ceph.git $distro/ceph
-#git clone  https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
+git clone  https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
 git clone  https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
 git clone  https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
 git clone  https://github.com/openstack/charm-cinder.git $distro/cinder
@@ -30,7 +30,7 @@ git clone  https://github.com/openstack/charm-glance.git $distro/glance
 git clone  https://github.com/openstack/charm-keystone.git $distro/keystone
 git clone  https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
 git clone  https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
-git clone  https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
+#git clone  https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
 git clone  https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
 git clone  https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
 git clone  https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
@@ -62,7 +62,7 @@ charm pull cs:$distro/aodh $distro/aodh
 #charm pull cs:~openstack-charmers-next/heat $distro/heat
 #charm pull cs:~openstack-charmers-next/lxd xenial/lxd
 
-#controller specific charm
-git clone  https://github.com/openstack/charm-odl-controller.git $distro/odl-controller
-git clone  https://github.com/openstack/charm-neutron-api-odl.git $distro/neutron-api-odl
-git clone  https://github.com/openstack/charm-openvswitch-odl.git $distro/openvswitch-odl
+#odl controller specific charm
+charm pull cs:$distro/odl-controller $distro/odl-controller
+charm pull cs:$distro/neutron-api-odl $distro/neutron-api-odl
+charm pull cs:~narindergupta/openvswitch-odl-1 $distro/openvswitch-odl