From: Narinder Gupta Date: Thu, 23 Feb 2017 15:33:31 +0000 (-0600) Subject: modified to get the juju 2.1.0 as release juju version. X-Git-Tag: danube.1.0~18^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ce2fba8990b72144649ef1a8c94b6c30f7254dae;p=joid.git modified to get the juju 2.1.0 as release juju version. Change-Id: I03cee75fab719d986ab5556ec9189816f7c9b9ee Signed-off-by: Narinder Gupta --- diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh index ee2cac9a..647d18b0 100755 --- a/ci/02-deploybundle.sh +++ b/ci/02-deploybundle.sh @@ -18,7 +18,6 @@ maasver=`apt-cache policy maas | grep Installed | cut -d ':' -f 2 | sed -e 's/ / if [[ "$opnfvmodel" = "openstack" ]]; then #copy and download charms ./$opnfvsdn/fetch-charms.sh $opnfvdistro - tar xvf common/scaleio.tar -C ./$opnfvdistro/ --strip=2 juju-scaleio/trusty/ osdomname='' else ./kubernetes/fetch-charms.sh $opnfvdistro @@ -31,7 +30,7 @@ check_status() { while [ $retval -eq 0 ]; do sleep 30 juju status > status.txt - if [ "$(grep -c "waiting" status.txt )" -ge 4 ]; then + if [ "$(grep -c "waiting" status.txt )" -ge 2 ]; then echo " still waiting for machines ..." if [ $timeoutiter -ge 240 ]; then retval=1 diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh index d2aaa36b..39a7609b 100755 --- a/ci/03-maasdeploy.sh +++ b/ci/03-maasdeploy.sh @@ -10,12 +10,12 @@ if [ ! -e $HOME/.ssh/id_rsa ]; then fi #install the packages needed -sudo apt-add-repository ppa:juju/devel -y +sudo apt-add-repository ppa:juju/stable -y sudo apt-add-repository ppa:maas/stable -y sudo apt-add-repository cloud-archive:newton -y sudo apt-get update -y #sudo apt-get dist-upgrade -y -sudo apt-get install openssh-server bzr git virtinst qemu-kvm libvirt-bin juju \ +sudo apt-get install bridge-utils openssh-server bzr git virtinst qemu-kvm libvirt-bin juju \ maas maas-region-controller python-pip python-psutil python-openstackclient \ python-congressclient gsutil charm-tools pastebinit python-jinja2 sshpass \ openssh-server vlan ipmitool jq expect -y diff --git a/ci/common/scaleio.tar b/ci/common/scaleio.tar deleted file mode 100644 index 8cb8d46d..00000000 Binary files a/ci/common/scaleio.tar and /dev/null differ diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh index 76de80c6..feac643f 100755 --- a/ci/nosdn/fetch-charms.sh +++ b/ci/nosdn/fetch-charms.sh @@ -14,33 +14,41 @@ 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 https://github.com/gnuoy/charm-congress.git $distro/charm-congress -build congress - -git clone https://github.com/openstack/charm-hacluster.git $distro/hacluster -git clone https://github.com/openstack/charm-ceilometer.git $distro/ceilometer -git clone https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent -git clone https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon -git clone https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd -git clone https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw -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 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 -git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch -git clone https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller -git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compute -git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard -git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server -git clone https://github.com/openstack/charm-heat.git $distro/heat -git clone https://github.com/openstack/charm-lxd.git xenial/lxd -#git clone https://github.com/openstack/openbaton.git xenial/openbaton +git clone -b stable/17.02 https://github.com/openstack/charm-hacluster.git $distro/hacluster +git clone -b stable/17.02 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer +git clone -b stable/17.02 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent +git clone -b stable/17.02 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon +git clone -b stable/17.02 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd +git clone -b stable/17.02 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw +git clone -b stable/17.02 https://github.com/openstack/charm-cinder.git $distro/cinder +git clone -b stable/17.02 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph +git clone -b stable/17.02 https://github.com/openstack/charm-glance.git $distro/glance +git clone -b stable/17.02 https://github.com/openstack/charm-keystone.git $distro/keystone +git clone -b stable/17.02 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster +git clone -b stable/17.02 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api +git clone -b stable/17.02 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway +git clone -b stable/17.02 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch +git clone -b stable/17.02 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller +git clone -b stable/17.02 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute +git clone -b stable/17.02 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard +git clone -b stable/17.02 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server +git clone -b stable/17.02 https://github.com/openstack/charm-heat.git $distro/heat +git clone -b stable/17.02 https://github.com/openstack/charm-lxd.git xenial/lxd +#git clone https://github.com/openstack/openbaton.git xenial/openbaton charm pull cs:$distro/aodh $distro/aodh charm pull cs:~free.ekanayaka/xenial/haproxy-1 $distro/haproxy +charm pull cs:~narindergupta/congress-0 $distro/congress + +#pulling scaleio charms. +charm pull cs:~cloudscaling/scaleio-mdm $distro/scaleio-mdm +charm pull cs:~cloudscaling/scaleio-sds $distro/scaleio-sds +charm pull cs:~cloudscaling/scaleio-gw $distro/scaleio-gw +charm pull cs:~cloudscaling/scaleio-sdc $distro/scaleio-sdc +charm pull cs:~cloudscaling/scaleio-openstack $distro/scaleio-openstack +charm pull cs:~cloudscaling/scaleio-cluster $distro/scaleio-cluster +charm pull cs:~cloudscaling/scaleio-gui $distro/scaleio-gui + #charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster #charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer #charm pull cs:~openstack-charmers-next/ceilometer-agent $distro/ceilometer-agent diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh index ff4886ea..86d2b51f 100755 --- a/ci/odl/fetch-charms.sh +++ b/ci/odl/fetch-charms.sh @@ -13,34 +13,39 @@ function build { 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 -charm pull cs:~narindergupta/neutron-gateway-0 $distro/neutron-gateway -git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress -build congress - -git clone https://github.com/openstack/charm-hacluster.git $distro/hacluster -git clone https://github.com/openstack/charm-ceilometer.git $distro/ceilometer -git clone https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent -git clone https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon -git clone https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd -git clone https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw -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 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 -git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch -git clone https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller -git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compute -git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard -git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server -git clone https://github.com/openstack/charm-heat.git $distro/heat -git clone https://github.com/openstack/charm-lxd.git xenial/lxd +git clone -b stable/17.02 https://github.com/openstack/charm-hacluster.git $distro/hacluster +git clone -b stable/17.02 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer +git clone -b stable/17.02 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent +git clone -b stable/17.02 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon +git clone -b stable/17.02 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd +git clone -b stable/17.02 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw +git clone -b stable/17.02 https://github.com/openstack/charm-cinder.git $distro/cinder +git clone -b stable/17.02 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph +git clone -b stable/17.02 https://github.com/openstack/charm-glance.git $distro/glance +git clone -b stable/17.02 https://github.com/openstack/charm-keystone.git $distro/keystone +git clone -b stable/17.02 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster +git clone -b stable/17.02 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api +#git clone -b stable/17.02 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway +git clone -b stable/17.02 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch +git clone -b stable/17.02 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller +git clone -b stable/17.02 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute +git clone -b stable/17.02 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard +git clone -b stable/17.02 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server +git clone -b stable/17.02 https://github.com/openstack/charm-heat.git $distro/heat +git clone -b stable/17.02 https://github.com/openstack/charm-lxd.git xenial/lxd charm pull cs:$distro/aodh $distro/aodh +#pulling scaleio charms. +charm pull cs:~cloudscaling/scaleio-mdm $distro/scaleio-mdm +charm pull cs:~cloudscaling/scaleio-sds $distro/scaleio-sds +charm pull cs:~cloudscaling/scaleio-gw $distro/scaleio-gw +charm pull cs:~cloudscaling/scaleio-sdc $distro/scaleio-sdc +charm pull cs:~cloudscaling/scaleio-openstack $distro/scaleio-openstack +charm pull cs:~cloudscaling/scaleio-cluster $distro/scaleio-cluster +charm pull cs:~cloudscaling/scaleio-gui $distro/scaleio-gui + #charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster #charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer #charm pull cs:~openstack-charmers-next/ceilometer-agent $distro/ceilometer-agent @@ -64,5 +69,7 @@ charm pull cs:$distro/aodh $distro/aodh #odl controller specific charm charm pull cs:$distro/odl-controller $distro/odl-controller -charm pull cs:$distro/neutron-api-odl $distro/neutron-api-odl -charm pull cs:~narindergupta/openvswitch-odl-1 $distro/openvswitch-odl +charm pull cs:~narindergupta/neutron-api-odl-8 $distro/neutron-api-odl +charm pull cs:~narindergupta/openvswitch-odl-2 $distro/openvswitch-odl +charm pull cs:~narindergupta/neutron-gateway-3 $distro/neutron-gateway +charm pull cs:~narindergupta/congress-0 $distro/congress diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh index 3e22b924..03e213c6 100755 --- a/ci/onos/fetch-charms.sh +++ b/ci/onos/fetch-charms.sh @@ -14,30 +14,37 @@ 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 https://github.com/gnuoy/charm-congress.git $distro/charm-congress -build congress - -git clone https://github.com/openstack/charm-hacluster.git $distro/hacluster -git clone https://github.com/openstack/charm-ceilometer.git $distro/ceilometer -git clone https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent -git clone https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon -git clone https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd -git clone https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw -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 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-openvswitch.git $distro/neutron-openvswitch -git clone https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller -git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compute -git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard -git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server -git clone https://github.com/openstack/charm-heat.git $distro/heat -git clone https://github.com/openstack/charm-lxd.git $distro/lxd +git clone -b stable/17.02 https://github.com/openstack/charm-hacluster.git $distro/hacluster +git clone -b stable/17.02 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer +git clone -b stable/17.02 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent +git clone -b stable/17.02 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon +git clone -b stable/17.02 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd +git clone -b stable/17.02 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw +git clone -b stable/17.02 https://github.com/openstack/charm-cinder.git $distro/cinder +git clone -b stable/17.02 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph +git clone -b stable/17.02 https://github.com/openstack/charm-glance.git $distro/glance +git clone -b stable/17.02 https://github.com/openstack/charm-keystone.git $distro/keystone +git clone -b stable/17.02 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster +git clone -b stable/17.02 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api +git clone -b stable/17.02 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch +git clone -b stable/17.02 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller +git clone -b stable/17.02 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute +git clone -b stable/17.02 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard +git clone -b stable/17.02 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server +git clone -b stable/17.02 https://github.com/openstack/charm-heat.git $distro/heat +git clone -b stable/17.02 https://github.com/openstack/charm-lxd.git $distro/lxd charm pull cs:$distro/aodh $distro/aodh +charm pull cs:~narindergupta/congress-0 $distro/congress + +#pulling scaleio charms. +charm pull cs:~cloudscaling/scaleio-mdm $distro/scaleio-mdm +charm pull cs:~cloudscaling/scaleio-sds $distro/scaleio-sds +charm pull cs:~cloudscaling/scaleio-gw $distro/scaleio-gw +charm pull cs:~cloudscaling/scaleio-sdc $distro/scaleio-sdc +charm pull cs:~cloudscaling/scaleio-openstack $distro/scaleio-openstack +charm pull cs:~cloudscaling/scaleio-cluster $distro/scaleio-cluster +charm pull cs:~cloudscaling/scaleio-gui $distro/scaleio-gui #charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster #charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh index 98348b13..3fc745e1 100755 --- a/ci/opencontrail/fetch-charms.sh +++ b/ci/opencontrail/fetch-charms.sh @@ -16,30 +16,37 @@ charm pull cs:trusty/mongodb $distro/mongodb charm pull cs:$distro/haproxy $distro/haproxy charm pull cs:$distro/ntp $distro/ntp charm pull cs:$distro/aodh $distro/aodh +charm pull cs:~narindergupta/congress-0 $distro/congress -git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress -build congress - -git clone https://github.com/openstack/charm-hacluster.git $distro/hacluster +git clone -b stable/17.02 https://github.com/openstack/charm-hacluster.git $distro/hacluster #bzr branch lp:~sdn-charmers/charms/$distro/ceilometer/ceilometer-plugin $distro/ceilometer -#git clone https://github.com/openstack/charm-ceilometer.git $distro/ceilometer -#git clone https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent -git clone https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon -git clone https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd -git clone https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw -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 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster -git clone https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway -#git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch -git clone https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller -git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compute -git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard -git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server -git clone https://github.com/openstack/charm-heat.git $distro/heat -git clone https://github.com/openstack/charm-neutron-api.git $distro/neutron-api +#git clone -b stable/17.02 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer +#git clone -b stable/17.02 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent +git clone -b stable/17.02 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon +git clone -b stable/17.02 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd +git clone -b stable/17.02 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw +git clone -b stable/17.02 https://github.com/openstack/charm-cinder.git $distro/cinder +git clone -b stable/17.02 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph +git clone -b stable/17.02 https://github.com/openstack/charm-glance.git $distro/glance +git clone -b stable/17.02 https://github.com/openstack/charm-keystone.git $distro/keystone +git clone -b stable/17.02 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster +git clone -b stable/17.02 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway +#git clone -b stable/17.02 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch +git clone -b stable/17.02 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller +git clone -b stable/17.02 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute +git clone -b stable/17.02 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard +git clone -b stable/17.02 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server +git clone -b stable/17.02 https://github.com/openstack/charm-heat.git $distro/heat +git clone -b stable/17.02 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api + +#pulling scaleio charms. +charm pull cs:~cloudscaling/scaleio-mdm $distro/scaleio-mdm +charm pull cs:~cloudscaling/scaleio-sds $distro/scaleio-sds +charm pull cs:~cloudscaling/scaleio-gw $distro/scaleio-gw +charm pull cs:~cloudscaling/scaleio-sdc $distro/scaleio-sdc +charm pull cs:~cloudscaling/scaleio-openstack $distro/scaleio-openstack +charm pull cs:~cloudscaling/scaleio-cluster $distro/scaleio-cluster +charm pull cs:~cloudscaling/scaleio-gui $distro/scaleio-gui #charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster #charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer