summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/deploy.sh6
-rwxr-xr-xci/kubernetes/fetch-charms.sh4
-rwxr-xr-xci/odl/fetch-charms.sh46
3 files changed, 31 insertions, 25 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index ab3e5e34..0534d841 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -340,11 +340,17 @@ if ([ $opnfvmodel == "openstack" ]); then
# creating heat domain after pushing the public API into /etc/hosts
status=`juju run-action heat/0 domain-setup`
echo $status
+ status=`juju run-action ceilometer/0 ceilometer-upgrade`
+ echo $status
if ([ $opnftype == "ha" ]); then
status=`juju run-action heat/1 domain-setup`
echo $status
+ status=`juju run-action ceilometer/1 ceilometer-upgrade`
+ echo $status
status=`juju run-action heat/2 domain-setup`
echo $status
+ status=`juju run-action ceilometer/2 ceilometer-upgrade`
+ echo $status
fi
sudo ../juju/get-cloud-images || true
diff --git a/ci/kubernetes/fetch-charms.sh b/ci/kubernetes/fetch-charms.sh
index 4ab94a98..3906d7bd 100755
--- a/ci/kubernetes/fetch-charms.sh
+++ b/ci/kubernetes/fetch-charms.sh
@@ -11,5 +11,5 @@ function build {
# openstack
charm pull cs:ntp $distro/ntp
-git clone -b stable/17.11 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
-git clone -b stable/17.11 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
+git clone -b stable/18.02 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
+git clone -b stable/18.02 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index cf8c6dc8..15cb941c 100755
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -12,29 +12,29 @@ function build {
# openstack
bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
-git clone -b stable/17.11 https://github.com/openstack/charm-hacluster.git $distro/hacluster
-git clone -b stable/17.11 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
-git clone -b stable/17.11 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
-git clone -b stable/17.11 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
-git clone -b stable/17.11 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
-git clone -b stable/17.11 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
-git clone -b stable/17.11 https://github.com/openstack/charm-cinder.git $distro/cinder
-git clone -b stable/17.11 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
-git clone -b stable/17.11 https://github.com/openstack/charm-glance.git $distro/glance
-git clone -b stable/17.11 https://github.com/openstack/charm-keystone.git $distro/keystone
-git clone -b stable/17.11 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
-git clone -b stable/17.11 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
-git clone -b stable/17.11 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
-git clone -b stable/17.11 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
-git clone -b stable/17.11 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
-git clone -b stable/17.11 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
-git clone -b stable/17.11 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
-git clone -b stable/17.11 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
-git clone -b stable/17.11 https://github.com/openstack/charm-heat.git $distro/heat
-git clone -b stable/17.11 https://github.com/openstack/charm-lxd.git $distro/lxd
-git clone -b stable/17.11 https://github.com/openstack/charm-odl-controller.git $distro/odl-controller
-git clone -b stable/17.11 https://github.com/openstack/charm-neutron-api-odl.git $distro/neutron-api-odl
-git clone -b stable/17.11 https://github.com/openstack/charm-openvswitch-odl.git $distro/openvswitch-odl
+git clone -b stable/18.02 https://github.com/openstack/charm-hacluster.git $distro/hacluster
+git clone -b stable/18.02 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
+git clone -b stable/18.02 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
+git clone -b stable/18.02 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
+git clone -b stable/18.02 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
+git clone -b stable/18.02 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
+git clone -b stable/18.02 https://github.com/openstack/charm-cinder.git $distro/cinder
+git clone -b stable/18.02 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
+git clone -b stable/18.02 https://github.com/openstack/charm-glance.git $distro/glance
+git clone -b stable/18.02 https://github.com/openstack/charm-keystone.git $distro/keystone
+git clone -b stable/18.02 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
+git clone -b stable/18.02 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
+git clone -b stable/18.02 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
+git clone -b stable/18.02 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
+git clone -b stable/18.02 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
+git clone -b stable/18.02 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
+git clone -b stable/18.02 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
+git clone -b stable/18.02 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
+git clone -b stable/18.02 https://github.com/openstack/charm-heat.git $distro/heat
+git clone -b stable/18.02 https://github.com/openstack/charm-lxd.git $distro/lxd
+git clone -b stable/18.02 https://github.com/openstack/charm-odl-controller.git $distro/odl-controller
+git clone -b stable/18.02 https://github.com/openstack/charm-neutron-api-odl.git $distro/neutron-api-odl
+git clone -b stable/18.02 https://github.com/openstack/charm-openvswitch-odl.git $distro/openvswitch-odl
git clone https://github.com/openbaton/juju-charm.git $distro/openbaton
charm pull cs:$distro/aodh $distro/aodh