From e7b1c6413fd2c924186900d4a2d22bf63a61601e Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Thu, 28 Jan 2016 09:56:51 -0600 Subject: cleaning the files which is not needed any more. Change-Id: I249ae0e1e4cae996f3a0dd4470a0804e4aa1f78e (cherry picked from commit 2190f14891c6afc2db49458995cf464c92d8a16c) --- ci/nosdn/01-deploybundle.sh | 78 ------------------------------------ ci/odl/01-deploybundle.sh | 78 ------------------------------------ ci/onos/01-deploybundle.sh | 81 -------------------------------------- ci/opencontrail/01-deploybundle.sh | 79 ------------------------------------- 4 files changed, 316 deletions(-) delete mode 100755 ci/nosdn/01-deploybundle.sh delete mode 100755 ci/odl/01-deploybundle.sh delete mode 100644 ci/onos/01-deploybundle.sh delete mode 100755 ci/opencontrail/01-deploybundle.sh diff --git a/ci/nosdn/01-deploybundle.sh b/ci/nosdn/01-deploybundle.sh deleted file mode 100755 index 2ef5c10c..00000000 --- a/ci/nosdn/01-deploybundle.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash -#placeholder for deployment script. -set -ex - -case "$1" in - 'nonha' ) - cp nosdn/juju-deployer/ovs.yaml ./bundles.yaml - ;; - 'ha' ) - cp nosdn/juju-deployer/ovs-ha.yaml ./bundles.yaml - ;; - 'tip' ) - cp nosdn/juju-deployer/ovs-tip.yaml ./bundles.yaml - cp common/source/* ./ - sed -i -- "s|branch: master|branch: stable/$2|g" ./*.yaml - ;; - * ) - cp nosdn/juju-deployer/ovs.yaml ./bundles.yaml - ;; -esac - -case "$3" in - 'orangepod2' ) - # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 - sed -i -- 's/10.4.1.1/192.168.2.2/g' ./bundles.yaml - # choose the correct interface to use for data network - sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 192.168.12.0\/24/g' ./bundles.yaml - # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml - ;; - 'intelpod6' ) - # As per your lab vip address list be deafult uses 10.4.1.21 - 10.4.1.29 - sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml - # choose the correct interface to use for data network - sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml - # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2"/g' ./bundles.yaml - ;; - 'intelpod5' ) - # As per your lab vip address list be deafult uses 10.4.1.21 - 10.4.1.29 - sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml - # choose the correct interface to use for data network - sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml - # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2.724"/g' ./bundles.yaml - ;; - 'attvirpod1' ) - # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 - sed -i -- 's/10.4.1.1/192.168.10.1/g' ./bundles.yaml - # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml - ;; - 'default' ) - sed -i -- 's/10.4.1.1/192.168.122.1/g' ./bundles.yaml - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml - ;; -esac - -echo "... Deployment Started ...." -case "$1" in - 'nonha' ) - juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" - ;; - 'ha' ) - juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" - ;; - 'tip' ) - juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" - ;; - * ) - juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" - ;; -esac - diff --git a/ci/odl/01-deploybundle.sh b/ci/odl/01-deploybundle.sh deleted file mode 100755 index 27b82ec5..00000000 --- a/ci/odl/01-deploybundle.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash -#placeholder for deployment script. -set -ex - -case "$1" in - 'nonha' ) - cp odl/juju-deployer/ovs-odl.yaml ./bundles.yaml - ;; - 'ha' ) - cp odl/juju-deployer/ovs-odl-ha.yaml ./bundles.yaml - ;; - 'tip' ) - cp odl/juju-deployer/ovs-odl-tip.yaml ./bundles.yaml - cp common/source/* ./ - sed -i -- "s|branch: master|branch: stable/$2|g" ./*.yaml - ;; - * ) - cp odl/juju-deployer/ovs-odl.yaml ./bundles.yaml - ;; -esac - -case "$3" in - 'orangepod2' ) - # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 - sed -i -- 's/10.4.1.1/192.168.2.2/g' ./bundles.yaml - # choose the correct interface to use for data network - sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 192.168.12.0\/24/g' ./bundles.yaml - # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml - ;; - 'intelpod6' ) - # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 - sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml - # choose the correct interface to use for data network - sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml - # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2"/g' ./bundles.yaml - ;; - 'intelpod5' ) - # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 - sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml - # choose the correct interface to use for data network - sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml - # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2.724"/g' ./bundles.yaml - ;; - 'attvirpod1' ) - # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 - sed -i -- 's/10.4.1.1/192.168.10.1/g' ./bundles.yaml - # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml - ;; - 'default' ) - sed -i -- 's/10.4.1.1/192.168.122.1/g' ./bundles.yaml - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml - ;; -esac - -echo "... Deployment Started ...." -case "$1" in - 'nonha' ) - juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" - ;; - 'ha' ) - juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" - ;; - 'tip' ) - juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" - ;; - * ) - juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" - ;; -esac - diff --git a/ci/onos/01-deploybundle.sh b/ci/onos/01-deploybundle.sh deleted file mode 100644 index 60935ad4..00000000 --- a/ci/onos/01-deploybundle.sh +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/bash -#placeholder for deployment script. -set -ex - -case "$1" in - 'nonha' ) - cp onos/juju-deployer/ovs-onos-nonha.yaml ./bundles.yaml - ;; - 'ha' ) - cp onos/juju-deployer/ovs-onos-ha.yaml ./bundles.yaml - ;; - 'tip' ) - cp onos/juju-deployer/ovs-onos-tip.yaml ./bundles.yaml - cp common/source/* ./ - sed -i -- "s|branch: master|branch: stable/$2|g" ./*.yaml - ;; - * ) - cp onos/juju-deployer/ovs-onos-nonha.yaml ./bundles.yaml - ;; -esac - -case "$3" in - 'orangepod2' ) - # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 - sed -i -- 's/10.4.1.1/192.168.2.2/g' ./bundles.yaml - # choose the correct interface to use for data network - sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 192.168.12.0\/24/g' ./bundles.yaml - # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml - ;; - 'intelpod6' ) - # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 - sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml - # choose the correct interface to use for data network - sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml - # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "brPublic"/g' ./bundles.yaml - ;; - 'intelpod5' ) - # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 - sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml - # choose the correct interface to use for data network - sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml - # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "brPublic"/g' ./bundles.yaml - ;; - 'attvirpod1' ) - # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 - sed -i -- 's/10.4.1.1/192.168.10.1/g' ./bundles.yaml - # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml - ;; - 'default' ) - sed -i -- 's/10.4.1.1/192.168.122.1/g' ./bundles.yaml - # sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml - ;; -esac - -echo "... Deployment Started ...." -case "$1" in - 'nonha' ) - juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" - ;; - 'ha' ) - juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" - ;; - 'tip' ) - juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" - ;; - * ) - juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" - ;; -esac - -echo "... onos prepare test ..." - sleep 180s - sh onos/juju_test_prepare.sh "$3" \ No newline at end of file diff --git a/ci/opencontrail/01-deploybundle.sh b/ci/opencontrail/01-deploybundle.sh deleted file mode 100755 index 4c1f5d5c..00000000 --- a/ci/opencontrail/01-deploybundle.sh +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/bash -#placeholder for deployment script. -set -ex - -case "$1" in - 'nonha' ) - cp opencontrail/juju-deployer/contrail.yaml ./bundles.yaml - ;; - 'ha' ) - cp opencontrail/juju-deployer/contrail-ha.yaml ./bundles.yaml - ;; - 'tip' ) - cp opencontrail/juju-deployer/contrail-tip.yaml ./bundles.yaml - cp common/source/* ./ - sed -i -- "s|branch: master|branch: stable/$2|g" ./*.yaml - ;; - * ) - cp opencontrail/juju-deployer/contrail.yaml ./bundles.yaml - ;; -esac - -case "$3" in - 'orangepod2' ) - # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 - sed -i -- 's/10.4.1.1/192.168.2.2/g' ./bundles.yaml - # choose the correct interface to use for data network - sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 192.168.12.0\/24/g' ./bundles.yaml - # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml - ;; - 'intelpod6' ) - # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 - sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml - # choose the correct interface to use for data network - sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml - # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2"/g' ./bundles.yaml - ;; - 'intelpod5' ) - # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 - sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml - # choose the correct interface to use for data network - sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml - # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2.724"/g' ./bundles.yaml - ;; - 'attvirpod1' ) - # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 - sed -i -- 's/10.4.1.1/192.168.10.1/g' ./bundles.yaml - # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml - ;; - 'default' ) - sed -i -- 's/10.4.1.1/192.168.122.1/g' ./bundles.yaml - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml - ;; - -esac - -echo "... Deployment Started ...." -case "$1" in - 'nonha' ) - juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" - ;; - 'ha' ) - juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" - ;; - 'tip' ) - juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" - ;; - * ) - juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" - ;; -esac - -- cgit 1.2.3-korg