diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-06-09 17:26:16 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-06-09 17:26:48 -0500 |
| commit | 700b7813fa18eda277b303a3de5905d3d875eec9 (patch) | |
| tree | 34c380da28ea3413f015afd30e70f6e72c095b85 /ci | |
| parent | 8d92025d7d812708d800e982f4310674d5c445df (diff) | |
modfiied to have a new onos charm with gateway support.
Change-Id: I4377f52d8fa077a5bfdcaaf1089fd8166abf5062
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/02-maasdeploy.sh | 2 | ||||
| -rwxr-xr-x | ci/nosdn/fetch-charms.sh | 4 | ||||
| -rwxr-xr-x | ci/onos/fetch-charms.sh | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh index 08bdc98f..e3bc99ff 100755 --- a/ci/02-maasdeploy.sh +++ b/ci/02-maasdeploy.sh @@ -12,7 +12,7 @@ sudo apt-add-repository ppa:maas/stable -y sudo apt-add-repository cloud-archive:mitaka -y sudo apt-get update -y sudo apt-get dist-upgrade -y -sudo apt-get install openssh-server git maas-deployer juju juju-deployer maas-cli python-pip python-openstackclient gsutil -y +sudo apt-get install openssh-server git maas-deployer juju juju-deployer maas-cli python-pip python-openstackclient python-congressclient gsutil -y #first parameter should be custom and second should be either # absolute location of file (including file name) or url of the diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh index 96f83055..ff0e7180 100755 --- a/ci/nosdn/fetch-charms.sh +++ b/ci/nosdn/fetch-charms.sh @@ -22,8 +22,8 @@ git clone https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-rados 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 bug/congress-fix https://github.com/gnuoy/charm-keystone.git $distro/keystone +git clone https://github.com/openstack/charm-keystone.git $distro/keystone +#git clone -b bug/congress-fix https://github.com/gnuoy/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 diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh index b511a673..f447fff5 100755 --- a/ci/onos/fetch-charms.sh +++ b/ci/onos/fetch-charms.sh @@ -28,6 +28,7 @@ git clone https://github.com/openstack/charm-heat.git $distro/heat # Controller specific charm bzr branch lp:~wuwenbin2/onosfw/onos-controller $distro/onos-controller -bzr branch lp:~wuwenbin2/onosfw/neutron-gateway $distro/neutron-gateway +#bzr branch lp:~wuwenbin2/onosfw/neutron-gateway $distro/neutron-gateway bzr branch lp:~wuwenbin2/onosfw/neutron-api-onos $distro/neutron-api-onos bzr branch lp:~wuwenbin2/onosfw/openvswitch-onos $distro/openvswitch-onos +bzr branch lp:~narindergupta/opnfv/neutron-gateway $distro/neutron-gateway |