AS stable/17.08 release so switching to 17.08 stable now. 99/41799/2
authorNarinder Gupta <narinder.gupta@canonical.com>
Tue, 12 Sep 2017 22:04:28 +0000 (17:04 -0500)
committerNarinder Gupta <narinder.gupta@canonical.com>
Tue, 12 Sep 2017 22:08:33 +0000 (17:08 -0500)
Change-Id: I7d27dfb372814591970e29425c1de2080d19b641
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
ci/nosdn/fetch-charms.sh
ci/odl/fetch-charms.sh
ci/onos/fetch-charms.sh
ci/opencontrail/fetch-charms.sh

index 10b492a..48feb59 100755 (executable)
@@ -12,26 +12,26 @@ function build {
 # openstack
 bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
 
-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-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
-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 $distro/lxd
+git clone -b stable/17.08 https://github.com/openstack/charm-hacluster.git $distro/hacluster
+git clone -b stable/17.08 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
+git clone -b stable/17.08 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
+git clone -b stable/17.08 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
+git clone -b stable/17.08 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
+git clone -b stable/17.08 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
+git clone -b stable/17.08 https://github.com/openstack/charm-cinder.git $distro/cinder
+git clone -b stable/17.08 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
+git clone -b stable/17.08 https://github.com/openstack/charm-glance.git $distro/glance
+git clone -b stable/17.08 https://github.com/openstack/charm-keystone.git $distro/keystone
+git clone -b stable/17.08 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
+git clone -b stable/17.08 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
+git clone -b stable/17.08 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
+git clone -b stable/17.08 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
+git clone -b stable/17.08 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
+git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
+git clone -b stable/17.08 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
+git clone -b stable/17.08 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
+git clone -b stable/17.08 https://github.com/openstack/charm-heat.git $distro/heat
+git clone -b stable/17.08 https://github.com/openstack/charm-lxd.git $distro/lxd
 git clone https://github.com/openbaton/juju-charm.git $distro/openbaton
 
 charm pull cs:$distro/aodh $distro/aodh
@@ -49,23 +49,3 @@ charm pull cs:~cloudscaling/scaleio-openstack $distro/scaleio-openstack
 charm pull cs:~cloudscaling/scaleio-cluster $distro/scaleio-cluster
 charm pull cs:~cloudscaling/scaleio-gui $distro/scaleio-gui
 
-#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
index 2bf5952..9b7adae 100755 (executable)
@@ -12,26 +12,29 @@ function build {
 # openstack
 bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
 
-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-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
-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 $distro/lxd
+git clone -b stable/17.08 https://github.com/openstack/charm-hacluster.git $distro/hacluster
+git clone -b stable/17.08 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
+git clone -b stable/17.08 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
+git clone -b stable/17.08 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
+git clone -b stable/17.08 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
+git clone -b stable/17.08 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
+git clone -b stable/17.08 https://github.com/openstack/charm-cinder.git $distro/cinder
+git clone -b stable/17.08 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
+git clone -b stable/17.08 https://github.com/openstack/charm-glance.git $distro/glance
+git clone -b stable/17.08 https://github.com/openstack/charm-keystone.git $distro/keystone
+git clone -b stable/17.08 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
+git clone -b stable/17.08 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
+git clone -b stable/17.08 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
+git clone -b stable/17.08 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
+git clone -b stable/17.08 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
+git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
+git clone -b stable/17.08 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
+git clone -b stable/17.08 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
+git clone -b stable/17.08 https://github.com/openstack/charm-heat.git $distro/heat
+git clone -b stable/17.08 https://github.com/openstack/charm-lxd.git $distro/lxd
+git clone -b stable/17.08 https://github.com/openstack/charm-odl-controller.git $distro/odl-controller
+git clone -b stable/17.08 https://github.com/openstack/charm-neutron-api-odl.git $distro/neutron-api-odl
+git clone -b stable/17.08 https://github.com/openstack/charm-openvswitch-odl.git $distro/openvswitch-odl
 git clone https://github.com/openbaton/juju-charm.git $distro/openbaton
 
 charm pull cs:$distro/aodh $distro/aodh
@@ -47,30 +50,9 @@ charm pull cs:~cloudscaling/scaleio-openstack $distro/scaleio-openstack
 charm pull cs:~cloudscaling/scaleio-cluster $distro/scaleio-cluster
 charm pull cs:~cloudscaling/scaleio-gui $distro/scaleio-gui
 
-#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
-
 #odl controller specific charm
-charm pull cs:$distro/odl-controller $distro/odl-controller
-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-6 $distro/neutron-gateway
+#charm pull cs:$distro/odl-controller $distro/odl-controller
+#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-6 $distro/neutron-gateway
 charm pull cs:~narindergupta/congress-1 $distro/congress
index ea6b3e6..3ffc628 100755 (executable)
@@ -14,24 +14,24 @@ 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
 
-git clone -b stable/17.02 https://github.com/openstack/charm-hacluster.git $distro/hacluster
-git clone -b stable/17.02 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
-git clone -b stable/17.02 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
-git clone -b stable/17.02 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
-git clone -b stable/17.02 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
-git clone -b stable/17.02 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
-git clone -b stable/17.02 https://github.com/openstack/charm-cinder.git $distro/cinder
-git clone -b stable/17.02 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
-git clone -b stable/17.02 https://github.com/openstack/charm-glance.git $distro/glance
-git clone -b stable/17.02 https://github.com/openstack/charm-keystone.git $distro/keystone
-git clone -b stable/17.02 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
-git clone -b stable/17.02 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
-git clone -b stable/17.02 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
-git clone -b stable/17.02 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
-git clone -b stable/17.02 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
-git clone -b stable/17.02 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
-git clone -b stable/17.02 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
-git clone -b stable/17.02 https://github.com/openstack/charm-heat.git $distro/heat
+git clone -b stable/17.08 https://github.com/openstack/charm-hacluster.git $distro/hacluster
+git clone -b stable/17.08 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
+git clone -b stable/17.08 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
+git clone -b stable/17.08 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
+git clone -b stable/17.08 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
+git clone -b stable/17.08 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
+git clone -b stable/17.08 https://github.com/openstack/charm-cinder.git $distro/cinder
+git clone -b stable/17.08 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
+git clone -b stable/17.08 https://github.com/openstack/charm-glance.git $distro/glance
+git clone -b stable/17.08 https://github.com/openstack/charm-keystone.git $distro/keystone
+git clone -b stable/17.08 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
+git clone -b stable/17.08 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
+git clone -b stable/17.08 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
+git clone -b stable/17.08 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
+git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
+git clone -b stable/17.08 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
+git clone -b stable/17.08 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
+git clone -b stable/17.08 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/openbaton/juju-charm.git $distro/openbaton
 
@@ -47,26 +47,6 @@ charm pull cs:~cloudscaling/scaleio-openstack $distro/scaleio-openstack
 charm pull cs:~cloudscaling/scaleio-cluster $distro/scaleio-cluster
 charm pull cs:~cloudscaling/scaleio-gui $distro/scaleio-gui
 
-#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
index 7a903c7..2a88ba6 100755 (executable)
@@ -12,26 +12,26 @@ function build {
 # openstack
 bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
 
-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-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
-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 $distro/lxd
+git clone -b stable/17.08 https://github.com/openstack/charm-hacluster.git $distro/hacluster
+git clone -b stable/17.08 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
+git clone -b stable/17.08 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
+git clone -b stable/17.08 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
+git clone -b stable/17.08 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
+git clone -b stable/17.08 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
+git clone -b stable/17.08 https://github.com/openstack/charm-cinder.git $distro/cinder
+git clone -b stable/17.08 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
+git clone -b stable/17.08 https://github.com/openstack/charm-glance.git $distro/glance
+git clone -b stable/17.08 https://github.com/openstack/charm-keystone.git $distro/keystone
+git clone -b stable/17.08 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
+git clone -b stable/17.08 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
+git clone -b stable/17.08 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
+git clone -b stable/17.08 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
+git clone -b stable/17.08 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
+git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
+git clone -b stable/17.08 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
+git clone -b stable/17.08 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
+git clone -b stable/17.08 https://github.com/openstack/charm-heat.git $distro/heat
+git clone -b stable/17.08 https://github.com/openstack/charm-lxd.git $distro/lxd
 git clone https://github.com/openbaton/juju-charm.git $distro/openbaton
 
 charm pull cs:$distro/mongodb $distro/mongodb