summaryrefslogtreecommitdiffstats
path: root/ci/01-deploybundle.sh
diff options
context:
space:
mode:
Diffstat (limited to 'ci/01-deploybundle.sh')
-rwxr-xr-xci/01-deploybundle.sh90
1 files changed, 6 insertions, 84 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index e53f3f50..6c8e9b80 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -12,23 +12,6 @@ set -ex
osdomname=''
-case "$1" in
- 'nonha' )
- cp $4/juju-deployer/ovs-$4-nonha.yaml ./bundles.yaml
- ;;
- 'ha' )
- cp $4/juju-deployer/ovs-$4-ha.yaml ./bundles.yaml
- ;;
- 'tip' )
- cp $4/juju-deployer/ovs-$4-tip.yaml ./bundles.yaml
- cp common/source/* ./
- sed -i -- "s|branch: master|branch: stable/$2|g" ./*.yaml
- ;;
- * )
- cp $4/juju-deployer/ovs-$4-nonha.yaml ./bundles.yaml
- ;;
-esac
-
#check whether charms are still executing the code even juju-deployer says installed.
check_status() {
retval=0
@@ -55,22 +38,10 @@ if [ -e ~/.juju/deployment.yaml ]; then
if [ -e ~/.juju/deployconfig.yaml ]; then
cp ~/.juju/deployconfig.yaml ./deployconfig.yaml
extport=`grep "ext-port" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //' | tr ',' ' '`
- sed --i "s@#ext-port: \"eth1\"@ext-port: \"$extport\"@g" ./bundles.yaml
datanet=`grep "dataNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
- if [ "$datanet" != "''" ]; then
- sed -i -- "s@#os-data-network: 10.4.8.0/21@os-data-network: $datanet@g" ./bundles.yaml
- fi
admnet=`grep "admNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
- sed --i "s@10.4.1.1@$admnet@g" ./bundles.yaml
cephdisk=`grep "ceph-disk" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
- sed --i "s@osd-devices: /srv@osd-devices: $cephdisk@g" ./bundles.yaml
osdomname=`grep "os-domain-name" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
- if [ "$osdomname" != "''" ]; then
- sed --i "s@#use-internal-endpoints: true@use-internal-endpoints: true@g" ./bundles.yaml
- sed --i "s@#endpoint-type: internalURL@endpoint-type: internalURL@g" ./bundles.yaml
- sed --i "s@#os-public-hostname: pod.maas@os-public-hostname: api.$osdomname@g" ./bundles.yaml
- sed --i "s@#console-proxy-ip: pod.maas@console-proxy-ip: $osdomname@g" ./bundles.yaml
- fi
fi
fi
@@ -82,10 +53,6 @@ case "$3" in
'ravellodemopod' )
sed -i -- 's/#ext-port: "eth1"/ext-port: "eth2"/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
# lets put the if seperateor as "," as this will save me from world.
@@ -97,65 +64,20 @@ for feature in $5; do
else
fea=$fea"_"$feature
fi
- case "$feature" in
- 'ipv6' )
- sed -i -- 's/#prefer-ipv6: true/prefer-ipv6: true/g' ./bundles.yaml
- ;;
- 'dvr' )
- sed -i -- 's/#enable-dvr: true/enable-dvr: true/g' ./bundles.yaml
- sed -i -- 's/#l2-population: true/l2-population: true/g' ./bundles.yaml
- ;;
- 'sfc' )
- sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-beryllium-sfc"/g' ./bundles.yaml
- ;;
- 'vpn' )
- sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-beryllium-vpn"/g' ./bundles.yaml
- ;;
- 'odl_l3' )
- sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-beryllium-l3"/g' ./bundles.yaml
- ;;
- 'dpdk' )
- sed -i -- 's/#enable-dpdk: true/enable-dpdk: true/g' ./bundles.yaml
- sed -i -- 's/#hugepages: "50%"/hugepages: "50%"/g' ./bundles.yaml
- ;;
- 'lxd' )
- sed -i -- 's/#- - nova-compute:lxd/- - nova-compute:lxd/g' ./bundles.yaml
- sed -i -- 's/#- lxd:lxd/- lxd:lxd/g' ./bundles.yaml
- sed -i -- 's/#virt-type: lxd/virt-type: lxd/g' ./bundles.yaml
- # adding the lxd subordinate charm
- echo " lxd:" >> ./bundles.yaml
- echo " charm: local:xenial/lxd" >> ./bundles.yaml
- ;;
- esac
done
-#changing the target to the openstack release we want to deploy.
-sed -i -- "s|mitaka|$2|g" ./bundles.yaml
-
#update source if trusty is target distribution
-case "$6" in
- 'trusty' )
- sed -i -- "s|#source|source|g" ./bundles.yaml
- sed -i -- "s|#source-branch:|source-branch:|g" ./bundles.yaml
- ;;
- 'xenial' )
- #changing the target to the ubuntu distro we want to deploy.
- sed -i -- "s|trusty|$6|g" ./bundles.yaml
- ;;
-esac
+var=os-$4-$fea-$1"-"$6"_"$2
if [ "$osdomname" != "''" ]; then
- var=os-$4-$fea-$1-publicapi
-else
- var=os-$4-$fea-$1
+ var=$var"_"publicapi
fi
#lets generate the bundle for all target using genBundle.py
python genBundle.py -l deployconfig.yaml -s $var > bundles.yaml
echo "... Deployment Started ...."
- juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $6-"$2"-nodes
- juju ssh nodes/0 "echo 512 | sudo tee /proc/sys/fs/inotify/max_user_instances"
- juju ssh nodes/1 "echo 512 | sudo tee /proc/sys/fs/inotify/max_user_instances"
- juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $6-"$2"
- #check_status
+juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $6-"$2"-nodes
+juju ssh nodes/0 "echo 512 | sudo tee /proc/sys/fs/inotify/max_user_instances"
+juju ssh nodes/1 "echo 512 | sudo tee /proc/sys/fs/inotify/max_user_instances"
+juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $6-"$2"