From: Narinder Gupta Date: Fri, 29 Jul 2016 00:49:26 +0000 (-0500) Subject: move back to ceph from ceph-mon charm as swift api was not working. X-Git-Tag: colorado.1.0~58 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=40852ce534510baa48038615158ecf3bb89e922d;p=joid.git move back to ceph from ceph-mon charm as swift api was not working. Change-Id: I1697fa52e5c160a63c0c70df3f430ca458917588 Signed-off-by: Narinder Gupta --- diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh index efdc7c32..da7963f6 100755 --- a/ci/nosdn/fetch-charms.sh +++ b/ci/nosdn/fetch-charms.sh @@ -22,7 +22,8 @@ build aodh git clone -b stable/16.07 https://github.com/openstack/charm-hacluster.git $distro/hacluster git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent -git clone -b stable/16.07 https://github.com/openstack/charm-ceph-mon.git $distro/ceph +git clone -b stable/16.07 https://github.com/openstack/charm-ceph.git $distro/ceph +#git clone -b stable/16.07 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon git clone -b stable/16.07 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd git clone -b stable/16.07 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw git clone -b stable/16.07 https://github.com/openstack/charm-cinder.git $distro/cinder diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh index 9ff1d37f..6b25797a 100755 --- a/ci/odl/fetch-charms.sh +++ b/ci/odl/fetch-charms.sh @@ -22,7 +22,8 @@ build aodh git clone -b stable/16.07 https://github.com/openstack/charm-hacluster.git $distro/hacluster git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent -git clone -b stable/16.07 https://github.com/openstack/charm-ceph-mon.git $distro/ceph +git clone -b stable/16.07 https://github.com/openstack/charm-ceph.git $distro/ceph +#git clone -b stable/16.07 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon git clone -b stable/16.07 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd git clone -b stable/16.07 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw git clone -b stable/16.07 https://github.com/openstack/charm-cinder.git $distro/cinder diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh index 6b1b9886..6ef2d341 100755 --- a/ci/onos/fetch-charms.sh +++ b/ci/onos/fetch-charms.sh @@ -22,7 +22,8 @@ build aodh git clone -b stable/16.07 https://github.com/openstack/charm-hacluster.git $distro/hacluster git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent -git clone -b stable/16.07 https://github.com/openstack/charm-ceph-mon.git $distro/ceph +git clone -b stable/16.07 https://github.com/openstack/charm-ceph.git $distro/ceph +#git clone -b stable/16.07 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon git clone -b stable/16.07 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd git clone -b stable/16.07 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw git clone -b stable/16.07 https://github.com/openstack/charm-cinder.git $distro/cinder diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh index 66efc40a..1b8fa955 100755 --- a/ci/opencontrail/fetch-charms.sh +++ b/ci/opencontrail/fetch-charms.sh @@ -23,7 +23,8 @@ build aodh git clone -b stable/16.07 https://github.com/openstack/charm-hacluster.git $distro/hacluster git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent -git clone -b stable/16.07 https://github.com/openstack/charm-ceph-mon.git $distro/ceph +git clone -b stable/16.07 https://github.com/openstack/charm-ceph.git $distro/ceph-mon +#git clone -b stable/16.07 https://github.com/openstack/charm-ceph-mon.git $distro/ceph git clone -b stable/16.07 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd git clone -b stable/16.07 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw git clone -b stable/16.07 https://github.com/openstack/charm-cinder.git $distro/cinder