summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-09-14 20:01:09 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2017-09-14 20:01:09 -0500
commit533dfeac9078ec05bc1c755078b4da74e8c5266d (patch)
tree379eb8b92b5b6e9848d3a2ecadbcf493ab161f4b
parent4eb4fdc5f39069f6af63992300f6fbf3e6534853 (diff)
pull in heat bug fix.
Change-Id: I1e43cb7ed7bdde953438ac3e0b123ea32ad94d16 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
-rwxr-xr-xci/nosdn/fetch-charms.sh3
-rwxr-xr-xci/odl/fetch-charms.sh3
-rwxr-xr-xci/onos/fetch-charms.sh3
-rwxr-xr-xci/opencontrail/fetch-charms.sh3
4 files changed, 12 insertions, 0 deletions
diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index 48feb590..93dd7e3e 100755
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/fetch-charms.sh
@@ -31,6 +31,9 @@ git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $d
git clone -b stable/17.08 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
git clone -b stable/17.08 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
git clone -b stable/17.08 https://github.com/openstack/charm-heat.git $distro/heat
+cd $distro/heat
+git pull https://git.openstack.org/openstack/charm-heat refs/changes/19/504219/1
+cd ../../
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
diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index 9b7adaed..565d48ee 100755
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -31,6 +31,9 @@ git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $d
git clone -b stable/17.08 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
git clone -b stable/17.08 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
git clone -b stable/17.08 https://github.com/openstack/charm-heat.git $distro/heat
+cd $distro/heat
+git pull https://git.openstack.org/openstack/charm-heat refs/changes/19/504219/1
+cd ../../
git clone -b stable/17.08 https://github.com/openstack/charm-lxd.git $distro/lxd
git clone -b stable/17.08 https://github.com/openstack/charm-odl-controller.git $distro/odl-controller
git clone -b stable/17.08 https://github.com/openstack/charm-neutron-api-odl.git $distro/neutron-api-odl
diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh
index 3ffc628f..cfe4f14b 100755
--- a/ci/onos/fetch-charms.sh
+++ b/ci/onos/fetch-charms.sh
@@ -32,6 +32,9 @@ git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $d
git clone -b stable/17.08 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
git clone -b stable/17.08 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
git clone -b stable/17.08 https://github.com/openstack/charm-heat.git $distro/heat
+cd $distro/heat
+git pull https://git.openstack.org/openstack/charm-heat refs/changes/19/504219/1
+cd ../../
git clone https://github.com/openstack/charm-lxd.git $distro/lxd
git clone https://github.com/openbaton/juju-charm.git $distro/openbaton
diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index 2a88ba63..7eb9bdfd 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -31,6 +31,9 @@ git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $d
git clone -b stable/17.08 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
git clone -b stable/17.08 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
git clone -b stable/17.08 https://github.com/openstack/charm-heat.git $distro/heat
+cd $distro/heat
+git pull https://git.openstack.org/openstack/charm-heat refs/changes/19/504219/1
+cd ../../
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