modfiied to use the latest git repo.

Change-Id: I23c2ead85deba04ccf824cb8d17e5708d5ec8a3a
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>

4 files changed, 162 insertions, 162 deletions

diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index c8a23f50..52af4257 100755
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/fetch-charms.sh
@@ -13,49 +13,49 @@ 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
-#bzr branch lp:~openstack-charmers/charms/trusty/hacluster/next $distro/hacluster
-
-charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster
-charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer
-charm pull cs:~openstack-charmers-next/ceilometer-agent $distro/ceilometer-agent
-charm pull cs:~openstack-charmers-next/ceph-mon $distro/ceph
-charm pull cs:~openstack-charmers-next/ceph-osd $distro/ceph-osd
-charm pull cs:~openstack-charmers-next/ceph-radosgw $distro/ceph-radosgw
-charm pull cs:~openstack-charmers-next/cinder $distro/cinder
-charm pull cs:~openstack-charmers-next/cinder-ceph $distro/cinder-ceph
-charm pull cs:~openstack-charmers-next/glance $distro/glance
-charm pull cs:~openstack-charmers-next/keystone $distro/keystone
-charm pull cs:~openstack-charmers-next/percona-cluster $distro/percona-cluster
-charm pull cs:~openstack-charmers-next/neutron-api $distro/neutron-api
-charm pull cs:~openstack-charmers-next/neutron-gateway $distro/neutron-gateway
-charm pull cs:~openstack-charmers-next/neutron-openvswitch $distro/neutron-openvswitch
-charm pull cs:~openstack-charmers-next/nova-cloud-controller $distro/nova-cloud-controller
-charm pull cs:~openstack-charmers-next/nova-compute $distro/nova-compute
-charm pull cs:~openstack-charmers-next/openstack-dashboard $distro/openstack-dashboard
-charm pull cs:~openstack-charmers-next/rabbitmq-server $distro/rabbitmq-server
-charm pull cs:~openstack-charmers-next/heat $distro/heat
-charm pull cs:~openstack-charmers-next/lxd xenial/lxd
-
-#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-mon.git $distro/ceph
-#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
-#git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
-#git clone https://github.com/openstack/charm-glance.git $distro/glance
-#git clone https://github.com/openstack/charm-keystone.git $distro/keystone
-#git clone -b stable/16.04 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-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
-#git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
-##charm pull cs:~james-page/xenial/rabbitmq-server-bug1590085 $distro/rabbitmq-server
-#git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
-#git clone https://github.com/openstack/charm-heat.git $distro/heat
-#git clone https://github.com/openstack/charm-lxd.git xenial/lxd
 
 git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
 build
+
+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-mon.git $distro/ceph
+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
+git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
+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-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
+git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
+git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
+git clone https://github.com/openstack/charm-heat.git $distro/heat
+git clone https://github.com/openstack/charm-lxd.git xenial/lxd
+
+#charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster
+#charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer
+#charm pull cs:~openstack-charmers-next/ceilometer-agent $distro/ceilometer-agent
+#charm pull cs:~openstack-charmers-next/ceph-mon $distro/ceph
+#charm pull cs:~openstack-charmers-next/ceph-osd $distro/ceph-osd
+#charm pull cs:~openstack-charmers-next/ceph-radosgw $distro/ceph-radosgw
+#charm pull cs:~openstack-charmers-next/cinder $distro/cinder
+#charm pull cs:~openstack-charmers-next/cinder-ceph $distro/cinder-ceph
+#charm pull cs:~openstack-charmers-next/glance $distro/glance
+#charm pull cs:~openstack-charmers-next/keystone $distro/keystone
+#charm pull cs:~openstack-charmers-next/percona-cluster $distro/percona-cluster
+#charm pull cs:~openstack-charmers-next/neutron-api $distro/neutron-api
+#charm pull cs:~openstack-charmers-next/neutron-gateway $distro/neutron-gateway
+#charm pull cs:~openstack-charmers-next/neutron-openvswitch $distro/neutron-openvswitch
+#charm pull cs:~openstack-charmers-next/nova-cloud-controller $distro/nova-cloud-controller
+#charm pull cs:~openstack-charmers-next/nova-compute $distro/nova-compute
+#charm pull cs:~openstack-charmers-next/openstack-dashboard $distro/openstack-dashboard
+#charm pull cs:~openstack-charmers-next/rabbitmq-server $distro/rabbitmq-server
+#charm pull cs:~openstack-charmers-next/heat $distro/heat
+#charm pull cs:~openstack-charmers-next/lxd xenial/lxd
+
diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index ce6f331c..c07a6b5c 100755
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -14,50 +14,50 @@ 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
 
-#bzr branch lp:~openstack-charmers/charms/trusty/hacluster/next $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-mon.git $distro/ceph
-#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
-#git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
-#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-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
-#git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
-#git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
-#git clone https://github.com/openstack/charm-heat.git $distro/heat
-#git clone https://github.com/openstack/charm-lxd.git xenial/lxd
-
 git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
 build
 
-charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster
-charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer
-charm pull cs:~openstack-charmers-next/ceilometer-agent $distro/ceilometer-agent
-charm pull cs:~openstack-charmers-next/ceph-mon $distro/ceph
-charm pull cs:~openstack-charmers-next/ceph-osd $distro/ceph-osd
-charm pull cs:~openstack-charmers-next/ceph-radosgw $distro/ceph-radosgw
-charm pull cs:~openstack-charmers-next/cinder $distro/cinder
-charm pull cs:~openstack-charmers-next/cinder-ceph $distro/cinder-ceph
-charm pull cs:~openstack-charmers-next/glance $distro/glance
-charm pull cs:~openstack-charmers-next/keystone $distro/keystone
-charm pull cs:~openstack-charmers-next/percona-cluster $distro/percona-cluster
-charm pull cs:~openstack-charmers-next/neutron-api $distro/neutron-api
-charm pull cs:~openstack-charmers-next/neutron-gateway $distro/neutron-gateway
-charm pull cs:~openstack-charmers-next/neutron-openvswitch $distro/neutron-openvswitch
-charm pull cs:~openstack-charmers-next/nova-cloud-controller $distro/nova-cloud-controller
-charm pull cs:~openstack-charmers-next/nova-compute $distro/nova-compute
-charm pull cs:~openstack-charmers-next/openstack-dashboard $distro/openstack-dashboard
-charm pull cs:~openstack-charmers-next/rabbitmq-server $distro/rabbitmq-server
-charm pull cs:~openstack-charmers-next/heat $distro/heat
-charm pull cs:~openstack-charmers-next/lxd xenial/lxd
+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-mon.git $distro/ceph
+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
+git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
+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-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
+git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
+git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
+git clone https://github.com/openstack/charm-heat.git $distro/heat
+git clone https://github.com/openstack/charm-lxd.git xenial/lxd
+
+#charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster
+#charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer
+#charm pull cs:~openstack-charmers-next/ceilometer-agent $distro/ceilometer-agent
+#charm pull cs:~openstack-charmers-next/ceph-mon $distro/ceph
+#charm pull cs:~openstack-charmers-next/ceph-osd $distro/ceph-osd
+#charm pull cs:~openstack-charmers-next/ceph-radosgw $distro/ceph-radosgw
+#charm pull cs:~openstack-charmers-next/cinder $distro/cinder
+#charm pull cs:~openstack-charmers-next/cinder-ceph $distro/cinder-ceph
+#charm pull cs:~openstack-charmers-next/glance $distro/glance
+#charm pull cs:~openstack-charmers-next/keystone $distro/keystone
+#charm pull cs:~openstack-charmers-next/percona-cluster $distro/percona-cluster
+#charm pull cs:~openstack-charmers-next/neutron-api $distro/neutron-api
+#charm pull cs:~openstack-charmers-next/neutron-gateway $distro/neutron-gateway
+#charm pull cs:~openstack-charmers-next/neutron-openvswitch $distro/neutron-openvswitch
+#charm pull cs:~openstack-charmers-next/nova-cloud-controller $distro/nova-cloud-controller
+#charm pull cs:~openstack-charmers-next/nova-compute $distro/nova-compute
+#charm pull cs:~openstack-charmers-next/openstack-dashboard $distro/openstack-dashboard
+#charm pull cs:~openstack-charmers-next/rabbitmq-server $distro/rabbitmq-server
+#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
diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh
index f12a62fb..a80baf59 100755
--- a/ci/onos/fetch-charms.sh
+++ b/ci/onos/fetch-charms.sh
@@ -14,48 +14,48 @@ 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
 
-#bzr branch lp:~openstack-charmers/charms/trusty/hacluster/next $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-mon.git $distro/ceph
-#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
-#git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
-#git clone https://github.com/openstack/charm-glance.git $distro/glance
-#git clone https://github.com/openstack/charm-keystone.git $distro/keystone
-#git clone -b stable/16.04 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-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
-#git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
-#git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
-#git clone https://github.com/openstack/charm-heat.git $distro/heat
-#git clone https://github.com/openstack/charm-lxd.git $distro/lxd
-
 git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
 build
 
-charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster
-charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer
-charm pull cs:~openstack-charmers-next/ceilometer-agent $distro/ceilometer-agent
-charm pull cs:~openstack-charmers-next/ceph-mon $distro/ceph
-charm pull cs:~openstack-charmers-next/ceph-osd $distro/ceph-osd
-charm pull cs:~openstack-charmers-next/ceph-radosgw $distro/ceph-radosgw
-charm pull cs:~openstack-charmers-next/cinder $distro/cinder
-charm pull cs:~openstack-charmers-next/cinder-ceph $distro/cinder-ceph
-charm pull cs:~openstack-charmers-next/glance $distro/glance
-charm pull cs:~openstack-charmers-next/keystone $distro/keystone
-charm pull cs:~openstack-charmers-next/percona-cluster $distro/percona-cluster
-charm pull cs:~openstack-charmers-next/neutron-api $distro/neutron-api
-charm pull cs:~openstack-charmers-next/neutron-openvswitch $distro/neutron-openvswitch
-charm pull cs:~openstack-charmers-next/nova-cloud-controller $distro/nova-cloud-controller
-charm pull cs:~openstack-charmers-next/nova-compute $distro/nova-compute
-charm pull cs:~openstack-charmers-next/openstack-dashboard $distro/openstack-dashboard
-charm pull cs:~openstack-charmers-next/rabbitmq-server $distro/rabbitmq-server
-charm pull cs:~openstack-charmers-next/heat $distro/heat
-charm pull cs:~openstack-charmers-next/lxd xenial/lxd
+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-mon.git $distro/ceph
+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
+git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
+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-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
+git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
+git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
+git clone https://github.com/openstack/charm-heat.git $distro/heat
+git clone https://github.com/openstack/charm-lxd.git $distro/lxd
+
+#charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster
+#charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer
+#charm pull cs:~openstack-charmers-next/ceilometer-agent $distro/ceilometer-agent
+#charm pull cs:~openstack-charmers-next/ceph-mon $distro/ceph
+#charm pull cs:~openstack-charmers-next/ceph-osd $distro/ceph-osd
+#charm pull cs:~openstack-charmers-next/ceph-radosgw $distro/ceph-radosgw
+#charm pull cs:~openstack-charmers-next/cinder $distro/cinder
+#charm pull cs:~openstack-charmers-next/cinder-ceph $distro/cinder-ceph
+#charm pull cs:~openstack-charmers-next/glance $distro/glance
+#charm pull cs:~openstack-charmers-next/keystone $distro/keystone
+#charm pull cs:~openstack-charmers-next/percona-cluster $distro/percona-cluster
+#charm pull cs:~openstack-charmers-next/neutron-api $distro/neutron-api
+#charm pull cs:~openstack-charmers-next/neutron-openvswitch $distro/neutron-openvswitch
+#charm pull cs:~openstack-charmers-next/nova-cloud-controller $distro/nova-cloud-controller
+#charm pull cs:~openstack-charmers-next/nova-compute $distro/nova-compute
+#charm pull cs:~openstack-charmers-next/openstack-dashboard $distro/openstack-dashboard
+#charm pull cs:~openstack-charmers-next/rabbitmq-server $distro/rabbitmq-server
+#charm pull cs:~openstack-charmers-next/heat $distro/heat
+#charm pull cs:~openstack-charmers-next/lxd xenial/lxd
 
 # Controller specific charm
 bzr branch lp:~zhangyuanyou/onosfw/onos-controller $distro/onos-controller
diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index 2f8ddad5..9ccf100d 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -16,48 +16,48 @@ bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb
 bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp
 bzr branch lp:~opnfv-team/charms/trusty/haproxy/trunk $distro/haproxy
 
-#bzr branch lp:~openstack-charmers/charms/trusty/hacluster/next $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-mon.git $distro/ceph
-#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
-#git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
-#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-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
-#git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
-#git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
-#git clone https://github.com/openstack/charm-heat.git $distro/heat
-
 git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
 build
 
-charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster
-charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer
-charm pull cs:~openstack-charmers-next/ceilometer-agent $distro/ceilometer-agent
-charm pull cs:~openstack-charmers-next/ceph-mon $distro/ceph
-charm pull cs:~openstack-charmers-next/ceph-osd $distro/ceph-osd
-charm pull cs:~openstack-charmers-next/ceph-radosgw $distro/ceph-radosgw
-charm pull cs:~openstack-charmers-next/cinder $distro/cinder
-charm pull cs:~openstack-charmers-next/cinder-ceph $distro/cinder-ceph
-charm pull cs:~openstack-charmers-next/glance $distro/glance
-charm pull cs:~openstack-charmers-next/keystone $distro/keystone
-charm pull cs:~openstack-charmers-next/percona-cluster $distro/percona-cluster
-charm pull cs:~openstack-charmers-next/neutron-api $distro/neutron-api
-charm pull cs:~openstack-charmers-next/neutron-gateway $distro/neutron-gateway
-charm pull cs:~openstack-charmers-next/neutron-openvswitch $distro/neutron-openvswitch
-charm pull cs:~openstack-charmers-next/nova-cloud-controller $distro/nova-cloud-controller
-charm pull cs:~openstack-charmers-next/nova-compute $distro/nova-compute
-charm pull cs:~openstack-charmers-next/openstack-dashboard $distro/openstack-dashboard
-charm pull cs:~openstack-charmers-next/rabbitmq-server $distro/rabbitmq-server
-charm pull cs:~openstack-charmers-next/heat $distro/heat
-charm pull cs:~openstack-charmers-next/lxd xenial/lxd
+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-mon.git $distro/ceph
+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
+git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
+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-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
+git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
+git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
+git clone https://github.com/openstack/charm-heat.git $distro/heat
+
+#charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster
+#charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer
+#charm pull cs:~openstack-charmers-next/ceilometer-agent $distro/ceilometer-agent
+#charm pull cs:~openstack-charmers-next/ceph-mon $distro/ceph
+#charm pull cs:~openstack-charmers-next/ceph-osd $distro/ceph-osd
+#charm pull cs:~openstack-charmers-next/ceph-radosgw $distro/ceph-radosgw
+#charm pull cs:~openstack-charmers-next/cinder $distro/cinder
+#charm pull cs:~openstack-charmers-next/cinder-ceph $distro/cinder-ceph
+#charm pull cs:~openstack-charmers-next/glance $distro/glance
+#charm pull cs:~openstack-charmers-next/keystone $distro/keystone
+#charm pull cs:~openstack-charmers-next/percona-cluster $distro/percona-cluster
+#charm pull cs:~openstack-charmers-next/neutron-api $distro/neutron-api
+#charm pull cs:~openstack-charmers-next/neutron-gateway $distro/neutron-gateway
+#charm pull cs:~openstack-charmers-next/neutron-openvswitch $distro/neutron-openvswitch
+#charm pull cs:~openstack-charmers-next/nova-cloud-controller $distro/nova-cloud-controller
+#charm pull cs:~openstack-charmers-next/nova-compute $distro/nova-compute
+#charm pull cs:~openstack-charmers-next/openstack-dashboard $distro/openstack-dashboard
+#charm pull cs:~openstack-charmers-next/rabbitmq-server $distro/rabbitmq-server
+#charm pull cs:~openstack-charmers-next/heat $distro/heat
+#charm pull cs:~openstack-charmers-next/lxd xenial/lxd
 
 # Controller specific charm
 bzr branch lp:~sdn-charmers/charms/trusty/keepalived/trunk $distro/keepalived