From c64f24e26c24772f2a4a64ddb75c8e2855ed2a76 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Tue, 3 May 2016 14:39:14 -0500 Subject: cleanup and also fetch the charms first then deploy. Change-Id: I7e9b2995ec7c32079903a3c8db0b2bd54a6e724e Signed-off-by: Narinder Gupta --- ci/opencontrail/fetch-charms.sh | 51 ++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 19 deletions(-) (limited to 'ci/opencontrail') diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh index 5f6f0f9f..2912e5c9 100755 --- a/ci/opencontrail/fetch-charms.sh +++ b/ci/opencontrail/fetch-charms.sh @@ -1,26 +1,39 @@ #!/bin/sh -ex -mkdir -p src/charms/trusty src/charms/precise +distro=$distro +mkdir -p $distro # openstack -bzr branch lp:~openstack-charmers/charms/trusty/glance/next src/charms/trusty/glance-next -bzr branch lp:~openstack-charmers/charms/trusty/keystone/next src/charms/trusty/keystone-next -bzr branch lp:~openstack-charmers/charms/trusty/neutron-api/next src/charms/trusty/neutron-api-next -bzr branch lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next src/charms/trusty/nova-cloud-controller-next -bzr branch lp:~openstack-charmers/charms/trusty/nova-compute/next src/charms/trusty/nova-compute-next -bzr branch lp:~openstack-charmers/charms/trusty/openstack-dashboard/next src/charms/trusty/openstack-dashboard-next +bzr branch lp:~openstack-charmers/charms/$distro/ceilometer/next $distro/ceilometer +bzr branch lp:~openstack-charmers/charms/$distro/ceilometer-agent/next $distro/ceilometer-agent +bzr branch lp:~openstack-charmers/charms/$distro/ceph/next $distro/ceph +bzr branch lp:~openstack-charmers/charms/$distro/ceph-osd/next $distro/ceph-osd +bzr branch lp:~openstack-charmers/charms/$distro/ceph-radosgw/next $distro/ceph-radosgw +bzr branch lp:~openstack-charmers/charms/$distro/cinder/next $distro/cinder +bzr branch lp:~openstack-charmers/charms/$distro/cinder-ceph/next $distro/cinder-ceph +bzr branch lp:~openstack-charmers/charms/$distro/glance/next $distro/glance +bzr branch lp:~narindergupta/charms/$distro/promise/trunk $distro/promise +bzr branch lp:~openstack-charmers/charms/$distro/keystone/next $distro/keystone +bzr branch lp:~openstack-charmers/charms/$distro/percona-cluster/next $distro/percona-cluster +bzr branch lp:~openstack-charmers/charms/$distro/neutron-api/next $distro/neutron-api +bzr branch lp:~openstack-charmers/charms/$distro/neutron-gateway/next $distro/neutron-gateway +bzr branch lp:~openstack-charmers/charms/$distro/neutron-openvswitch/next $distro/neutron-openvswitch +bzr branch lp:~openstack-charmers/charms/$distro/nova-cloud-controller/next $distro/nova-cloud-controller +bzr branch lp:~openstack-charmers/charms/$distro/nova-compute/next $distro/nova-compute +bzr branch lp:~openstack-charmers/charms/$distro/openstack-dashboard/next $distro/openstack-dashboard +bzr branch lp:~openstack-charmers/charms/$distro/rabbitmq-server/next $distro/rabbitmq-server +bzr branch lp:~openstack-charmers/charms/$distro/hacluster/next $distro/hacluster +bzr branch lp:~openstack-charmers/charms/$distro/heat/next $distro/heat +bzr branch lp:~opnfv-team/charms/$distro/haproxy/trunk $distro/haproxy -# contrail -bzr branch lp:~stub/charms/trusty/cassandra/noauthentication src/charms/trusty/cassandra-noauthentication -bzr branch lp:~sdn-charmers/charms/trusty/contrail-analytics/trunk src/charms/trusty/contrail-analytics -bzr branch lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk src/charms/trusty/contrail-configuration -bzr branch lp:~sdn-charmers/charms/trusty/contrail-control/trunk src/charms/trusty/contrail-control -bzr branch lp:~sdn-charmers/charms/trusty/contrail-webui/trunk src/charms/trusty/contrail-webui -bzr branch lp:~sdn-charmers/charms/trusty/neutron-api-contrail/trunk src/charms/trusty/neutron-api-contrail -bzr branch lp:~sdn-charmers/charms/trusty/neutron-contrail/trunk src/charms/trusty/neutron-contrail +# Controller specific charm +bzr branch lp:~sdn-charmers/charms/$distro/keepalived/trunk $distro/keepalived +bzr branch lp:~stub/charms/$distro/cassandra/noauthentication $distro/cassandra-noauthentication +bzr branch lp:~sdn-charmers/charms/$distro/contrail-analytics/trunk $distro/contrail-analytics +bzr branch lp:~sdn-charmers/charms/$distro/contrail-configuration/trunk $distro/contrail-configuration +bzr branch lp:~sdn-charmers/charms/$distro/contrail-control/trunk $distro/contrail-control +bzr branch lp:~sdn-charmers/charms/$distro/contrail-webui/trunk $distro/contrail-webui bzr branch lp:~charmers/charms/precise/zookeeper/trunk src/charms/precise/zookeeper +bzr branch lp:~opnfv-team/charms/$distro/neutron-api-contrail/trunk $distro/neutron-api-contrail +bzr branch lp:~opnfv-team/charms/$distro/neutron-contrail/trunk $distro/neutron-contrail -mkdir -p charms/trusty charms/precise -(cd charms/trusty; ln -s ../../src/charms/trusty/* .) -# symlink trusty charms to precise -(cd charms/precise; ln -s ../../src/charms/trusty/* .; ln -s ../../src/charms/precise/* .) -- cgit 1.2.3-korg