summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-12-01 17:42:49 +0000
committerNarinder Gupta <narinder.gupta@canonical.com>2017-12-01 17:42:49 +0000
commit627e4cd984a280fe63fa7bfb11a3cf62fce05229 (patch)
tree57cf145469d547224b1aad8487d31c07ff8425aa
parentf3f3a1fee413ed5e302193c4e4533ef1dbc17b4e (diff)
Revert "added new ntp charm to remove the K8 issues."
This reverts commit f3f3a1fee413ed5e302193c4e4533ef1dbc17b4e. Change-Id: Ibc85ba73670b58aabce665aeb1b6e33fe29fa79e Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
-rwxr-xr-xci/kubernetes/fetch-charms.sh2
-rwxr-xr-xci/nosdn/fetch-charms.sh2
-rwxr-xr-xci/odl/fetch-charms.sh2
-rwxr-xr-xci/onos/fetch-charms.sh2
-rwxr-xr-xci/opencontrail/fetch-charms.sh2
5 files changed, 5 insertions, 5 deletions
diff --git a/ci/kubernetes/fetch-charms.sh b/ci/kubernetes/fetch-charms.sh
index b40b732..fd784ba 100755
--- a/ci/kubernetes/fetch-charms.sh
+++ b/ci/kubernetes/fetch-charms.sh
@@ -10,7 +10,7 @@ function build {
}
# openstack
-charm pull cs:ntp $distro/ntp
+bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp
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
diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index feb41b0..48feb59 100755
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/fetch-charms.sh
@@ -36,7 +36,7 @@ git clone https://github.com/openbaton/juju-charm.git $distro/openbaton
charm pull cs:$distro/aodh $distro/aodh
charm pull cs:$distro/mongodb $distro/mongodb
-charm pull cs:ntp $distro/ntp
+charm pull cs:$distro/ntp $distro/ntp
charm pull cs:$distro/haproxy $distro/haproxy
charm pull cs:~narindergupta/congress-1 $distro/congress
diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index 2f014c4..9b7adae 100755
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -39,7 +39,7 @@ git clone https://github.com/openbaton/juju-charm.git $distro/openbaton
charm pull cs:$distro/aodh $distro/aodh
charm pull cs:$distro/mongodb $distro/mongodb
-charm pull cs:ntp $distro/ntp
+charm pull cs:$distro/ntp $distro/ntp
#pulling scaleio charms.
charm pull cs:~cloudscaling/scaleio-mdm $distro/scaleio-mdm
diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh
index a8d9778..3ffc628 100755
--- a/ci/onos/fetch-charms.sh
+++ b/ci/onos/fetch-charms.sh
@@ -12,6 +12,7 @@ function build {
# openstack
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.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
@@ -34,7 +35,6 @@ git clone -b stable/17.08 https://github.com/openstack/charm-heat.git $distro/he
git clone https://github.com/openstack/charm-lxd.git $distro/lxd
git clone https://github.com/openbaton/juju-charm.git $distro/openbaton
-charm pull cs:ntp $distro/ntp
charm pull cs:$distro/aodh $distro/aodh
charm pull cs:~narindergupta/congress-1 $distro/congress
diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index 62fbbd6..2a88ba6 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -35,7 +35,7 @@ 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
-charm pull cs:ntp $distro/ntp
+charm pull cs:$distro/ntp $distro/ntp
charm pull cs:$distro/aodh $distro/aodh
charm pull cs:~free.ekanayaka/xenial/haproxy-1 $distro/haproxy
charm pull cs:~narindergupta/congress-1 $distro/congress