From 7208685b13a35f7f25cb4a7221058f358453cb50 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Tue, 14 Jun 2016 19:27:27 -0500 Subject: modified to clean the environment and also change in bundles to deploy ocl as well. Change-Id: I40f32bad5b94b335bd5bd37d3c626d4a5e336061 Signed-off-by: Narinder Gupta --- ci/opencontrail/fetch-charms.sh | 19 ++++++++++--------- .../juju-deployer/ovs-opencontrail-ha.yaml | 4 ++-- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'ci/opencontrail') diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh index 3dd8fa0f..d25881b7 100755 --- a/ci/opencontrail/fetch-charms.sh +++ b/ci/opencontrail/fetch-charms.sh @@ -26,7 +26,7 @@ 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-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 @@ -38,12 +38,13 @@ git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress build # 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:~sdn-charmers/charms/trusty/keepalived/trunk $distro/keepalived +bzr branch lp:~stub/charms/trusty/cassandra/noauthentication $distro/cassandra +bzr branch lp:~sdn-charmers/charms/trusty/contrail-analytics/trunk $distro/contrail-analytics +bzr branch lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk $distro/contrail-configuration +bzr branch lp:~sdn-charmers/charms/trusty/contrail-control/trunk $distro/contrail-control +bzr branch lp:~sdn-charmers/charms/trusty/contrail-webui/trunk $distro/contrail-webui bzr branch lp:~charmers/charms/precise/zookeeper/trunk 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 +bzr branch lp:~opnfv-team/charms/trusty/neutron-api-contrail/trunk $distro/neutron-api-contrail +bzr branch lp:~opnfv-team/charms/trusty/neutron-contrail/trunk $distro/neutron-contrail +bzr branch lp:~opnfv-team/charms/trusty/neutron-api/next $distro/neutron-api diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml index 6e84b6cf..1849f27b 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml @@ -260,7 +260,6 @@ openstack-phase2: options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: "" monitor-count: 3 # osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 @@ -382,6 +381,7 @@ openstack-phase2: congress: charm: local:trusty/congress options: - #source-charm: stable/mitaka + #source-branch: stable/mitaka to: - "lxc:nodes=0" + -- cgit 1.2.3-korg