6 files changed, 202 insertions, 115 deletions

diff --git a/ci/bundle_tpl/relations.yaml b/ci/bundle_tpl/relations.yaml
index afbeeb11..e7bc6799 100644
--- a/ci/bundle_tpl/relations.yaml
+++ b/ci/bundle_tpl/relations.yaml
@@ -38,9 +38,9 @@
     - [ 'heat:shared-db', 'mysql:shared-db' ]
     - [ 'heat:identity-service', 'keystone:identity-service' ]
     - [ 'heat:amqp', 'rabbitmq-server:amqp' ]
-    - [ 'congress:shared-db', 'mysql:shared-db' ]
-    - [ 'congress:identity-service', 'keystone:identity-service' ]
-    - [ 'congress:amqp', 'rabbitmq-server:amqp' ]
+#    - [ 'congress:shared-db', 'mysql:shared-db' ]
+#    - [ 'congress:identity-service', 'keystone:identity-service' ]
+#    - [ 'congress:amqp', 'rabbitmq-server:amqp' ]
 {% if os.lxd %}
     - [ 'nova-compute:lxd', 'lxd:lxd' ]
 {% endif %}
diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index 27558a32..c8a23f50 100755
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/fetch-charms.sh
@@ -13,26 +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
-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
+#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
diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index 7fa63eeb..ce6f331c 100755
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -13,30 +13,52 @@ 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
-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
+
+#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
-git clone https://github.com/openstack/charm-lxd.git xenial/lxd
 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
+
 #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
diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh
index 396ac8c8..f12a62fb 100755
--- a/ci/onos/fetch-charms.sh
+++ b/ci/onos/fetch-charms.sh
@@ -13,31 +13,52 @@ 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
-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
-#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
+
+#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
+
 # Controller specific charm
 bzr branch lp:~zhangyuanyou/onosfw/onos-controller $distro/onos-controller
 bzr branch lp:~zhangyuanyou/onosfw/neutron-gateway $distro/neutron-gateway
 bzr branch lp:~zhangyuanyou/onosfw/neutron-api-onos $distro/neutron-api-onos
 bzr branch lp:~zhangyuanyou/onosfw/openvswitch-onos $distro/openvswitch-onos
-#bzr branch lp:~narindergupta/opnfv/neutron-gateway $distro/neutron-gateway
diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index 5e6c9cbb..2f8ddad5 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -14,30 +14,51 @@ 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
 bzr branch lp:~opnfv-team/charms/trusty/haproxy/trunk $distro/haproxy
-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
+
+#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
+
 # Controller specific charm
 bzr branch lp:~sdn-charmers/charms/trusty/keepalived/trunk $distro/keepalived
 bzr branch lp:~stub/charms/trusty/cassandra/noauthentication $distro/cassandra
diff --git a/ci/openstack.sh b/ci/openstack.sh
index 7f5c4c70..d0d7f8a0 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -173,36 +173,36 @@ if [ "$API_FQDN" != "''" ]; then
     openstack endpoint create --region Canonical policy public $CONGRESS_NEW_PUB_ENDPOINT
 fi
 
-openstack congress datasource create nova "nova" \
-  --config username=$OS_USERNAME \
-  --config tenant_name=$OS_TENANT_NAME \
-  --config password=$OS_PASSWORD \
-  --config auth_url=http://$keystoneIp:5000/v2.0
-openstack congress datasource create neutronv2 "neutronv2" \
-  --config username=$OS_USERNAME \
-  --config tenant_name=$OS_TENANT_NAME \
-  --config password=$OS_PASSWORD \
-  --config auth_url=http://$keystoneIp:5000/v2.0
-openstack congress datasource create ceilometer "ceilometer" \
-  --config username=$OS_USERNAME \
-  --config tenant_name=$OS_TENANT_NAME \
-  --config password=$OS_PASSWORD \
-  --config auth_url=http://$keystoneIp:5000/v2.0
-openstack congress datasource create cinder "cinder" \
-  --config username=$OS_USERNAME \
-  --config tenant_name=$OS_TENANT_NAME \
-  --config password=$OS_PASSWORD \
-  --config auth_url=http://$keystoneIp:5000/v2.0
-openstack congress datasource create glancev2 "glancev2" \
-  --config username=$OS_USERNAME \
-  --config tenant_name=$OS_TENANT_NAME \
-  --config password=$OS_PASSWORD \
-  --config auth_url=http://$keystoneIp:5000/v2.0
-openstack congress datasource create keystone "keystone" \
-  --config username=$OS_USERNAME \
-  --config tenant_name=$OS_TENANT_NAME \
-  --config password=$OS_PASSWORD \
-  --config auth_url=http://$keystoneIp:5000/v2.0
+#openstack congress datasource create nova "nova" \
+#  --config username=$OS_USERNAME \
+#  --config tenant_name=$OS_TENANT_NAME \
+#  --config password=$OS_PASSWORD \
+#  --config auth_url=http://$keystoneIp:5000/v2.0
+#openstack congress datasource create neutronv2 "neutronv2" \
+#  --config username=$OS_USERNAME \
+#  --config tenant_name=$OS_TENANT_NAME \
+#  --config password=$OS_PASSWORD \
+#  --config auth_url=http://$keystoneIp:5000/v2.0
+#openstack congress datasource create ceilometer "ceilometer" \
+#  --config username=$OS_USERNAME \
+#  --config tenant_name=$OS_TENANT_NAME \
+#  --config password=$OS_PASSWORD \
+#  --config auth_url=http://$keystoneIp:5000/v2.0
+#openstack congress datasource create cinder "cinder" \
+#  --config username=$OS_USERNAME \
+#  --config tenant_name=$OS_TENANT_NAME \
+#  --config password=$OS_PASSWORD \
+#  --config auth_url=http://$keystoneIp:5000/v2.0
+#openstack congress datasource create glancev2 "glancev2" \
+#  --config username=$OS_USERNAME \
+#  --config tenant_name=$OS_TENANT_NAME \
+#  --config password=$OS_PASSWORD \
+#  --config auth_url=http://$keystoneIp:5000/v2.0
+#openstack congress datasource create keystone "keystone" \
+#  --config username=$OS_USERNAME \
+#  --config tenant_name=$OS_TENANT_NAME \
+#  --config password=$OS_PASSWORD \
+#  --config auth_url=http://$keystoneIp:5000/v2.0
 
 
 ##enable extra stuff only if testing manually