X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2F02-maasdeploy.sh;h=62e57da5eea750157ab9670ccb10e11d18f809d6;hb=619773c3be56822439e26c828bbdb3f173b03cff;hp=72bb3d14e1aab0284ecf4f1106cdc040f6910172;hpb=a62a80944d6f925fbead89ee0718d84b8b5ef296;p=joid.git diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh index 72bb3d14..62e57da5 100755 --- a/ci/02-maasdeploy.sh +++ b/ci/02-maasdeploy.sh @@ -3,39 +3,104 @@ set -ex virtinstall=0 +labname=$1 -case "$1" in - 'intelpod5' ) - cp maas/intel/pod5/deployment.yaml ./deployment.yaml - ;; - 'intelpod6' ) - cp maas/intel/pod6/deployment.yaml ./deployment.yaml - ;; - 'orangepod2' ) - cp maas/orange/pod2/deployment.yaml ./deployment.yaml - ;; - 'attvirpod1' ) - cp maas/att/virpod1/deployment.yaml ./deployment.yaml - ;; - 'juniperpod1' ) - cp maas/juniper/pod1/deployment.yaml ./deployment.yaml - ;; - 'cengnlynxpod1' ) - cp maas/cengn_lynx/pod1/deployment.yaml ./deployment.yaml - ;; - * ) +#install the packages needed +sudo apt-add-repository ppa:maas-deployers/stable -y +sudo apt-add-repository ppa:juju/stable -y +sudo apt-add-repository ppa:maas/stable -y +sudo apt-add-repository cloud-archive:mitaka -y +sudo apt-get update -y +sudo apt-get dist-upgrade -y +sudo apt-get install openssh-server git maas-deployer juju juju-deployer maas-cli python-pip python-openstackclient python-congressclient gsutil -y + +#first parameter should be custom and second should be either +# absolute location of file (including file name) or url of the +# file to download. + +if [ "$1" == "custom" ]; then + if [ -e $2 ]; then + cp $2 ./labconfig.yaml || true + python deploy.py + else + wget $2 -t 3 -T 10 -O ./labconfig.yaml || true + count=`wc -l labconfig.yaml | cut -d " " -f 1` + + if [ $count -lt 10 ]; then + rm -rf labconfig.yaml + else + python deploy.py + fi + fi + + if [ ! -e ./labconfig.yaml ]; then virtinstall=1 - cp maas/default/deployment.yaml ./deployment.yaml - ;; -esac + cp ../labconfig/default/deployment.yaml ./ + cp ../labconfig/default/labconfig.yaml ./ + fi + labname=`grep "maas_name" deployment.yaml | cut -d ':' -f 2 | sed -e 's/ //'` +else + case "$1" in + 'intelpod5' ) + cp ../labconfig/intel/pod5/labconfig.yaml ./ + #to be removed later once converted for all labs. + python deploy.py + ;; + 'intelpod6' ) + cp ../labconfig/intel/pod6/labconfig.yaml ./ + #to be removed later once converted for all labs. + python deploy.py + ;; + 'intelpod9' ) + cp ../labconfig/intel/pod6/labconfig.yaml ./ + #to be removed later once converted for all labs. + python deploy.py + ;; + 'orangepod1' ) + cp ../labconfig/orange/pod1/labconfig.yaml ./ + #to be removed later once converted for all labs. + python deploy.py + ;; + 'orangepod2' ) + cp ../labconfig/orange/pod1/labconfig.yaml ./ + #to be removed later once converted for all labs. + python deploy.py + ;; + 'attvirpod1' ) + cp ../labconfig/att/virpod1/labconfig.yaml ./ + #to be removed later once converted for all labs. + python deploy.py + ;; + 'juniperpod1' ) + cp maas/juniper/pod1/deployment.yaml ./deployment.yaml + ;; + 'cengnlynxpod1' ) + cp maas/cengn_lynx/pod1/deployment.yaml ./deployment.yaml + ;; + 'cengnpod1' ) + cp ../labconfig/cengn/pod1/labconfig.yaml ./ + #to be removed later once converted for all labs. + python deploy.py + ;; + * ) + virtinstall=1 + labname="default" + ./cleanvm.sh + cp ../labconfig/default/deployment.yaml ./ + cp ../labconfig/default/deployconfig.yaml ./ + ;; + esac +fi -#make sure no password asked during the deployment. +#make sure no password asked during the deployment. echo "$USER ALL=(ALL) NOPASSWD:ALL" > 90-joid-init if [ -e /etc/sudoers.d/90-joid-init ]; then sudo cp /etc/sudoers.d/90-joid-init 91-joid-init - cat 90-joid-init >> 91-joid-init + sudo chown $USER:$USER 91-joid-init + sudo chmod 660 91-joid-init + sudo cat 90-joid-init >> 91-joid-init sudo chown root:root 91-joid-init sudo mv 91-joid-init /etc/sudoers.d/ else @@ -49,21 +114,21 @@ if [ ! -e $HOME/.ssh/id_rsa ]; then ssh-keygen -N '' -f $HOME/.ssh/id_rsa fi -if [ ! -e /var/lib/libvirt/images ]; then +#define the pool and try to start even though its already exist. +# For fresh install this may or may not there. - sudo apt-get install libvirt-bin -y - sudo adduser ubuntu libvirtd - sudo virsh pool-define-as default --type dir --target /var/lib/libvirt/images/ - sudo virsh pool-start default - sudo virsh pool-autostart default +sudo apt-get install libvirt-bin -y +sudo adduser $USER libvirtd +sudo virsh pool-define-as default --type dir --target /var/lib/libvirt/images/ || true +sudo virsh pool-start default || true +sudo virsh pool-autostart default || true +# To avoid problem between apiclient/maas_client and apiclient from google +# we remove the package google-api-python-client from yardstick installer +if [ $(pip list |grep google-api-python-client |wc -l) == 1 ]; then + sudo pip uninstall google-api-python-client fi -sudo apt-add-repository ppa:maas-deployers/stable -y -sudo apt-add-repository ppa:juju/stable -y -sudo apt-add-repository ppa:maas/stable -y -sudo apt-get update -y -sudo apt-get install openssh-server git maas-deployer juju juju-deployer maas-cli python-pip -y sudo pip install shyaml juju init -f @@ -116,25 +181,35 @@ crnodevlanint() { for nodes in $listofnodes do - parentid=`maas maas interface read $nodes eth2 | grep interfaces | cut -d '/' -f 8` + parentid=`maas maas interface read $nodes $2 | grep interfaces | cut -d '/' -f 8` maas maas interfaces create-vlan $nodes vlan=$1 parent=$parentid done } +#just make sure the ssh keys added into maas for the current user +sed --i "s@/home/ubuntu@$HOME@g" ./deployment.yaml +sed --i "s@qemu+ssh://ubuntu@qemu+ssh://$USER@g" ./deployment.yaml + +cp ./deployment.yaml ~/.juju/ + +if [ -e ./deployconfig.yaml ]; then + cp ./deployconfig.yaml ~/.juju/ +fi + sudo maas-deployer -c deployment.yaml -d --force sudo chown $USER:$USER environments.yaml echo "... Deployment of maas finish ...." -maas_ip=`grep " ip_address" deployment.yaml | cut -d " " -f 10` +maas_ip=`grep " ip_address" deployment.yaml | cut -d ':' -f 2 | sed -e 's/ //'` apikey=`grep maas-oauth: environments.yaml | cut -d "'" -f 2` maas login maas http://${maas_ip}/MAAS/api/1.0 ${apikey} -maas maas boot-source update 1 url="http://maas.ubuntu.com/images/ephemeral-v2/daily/" -#maas maas boot-source-selections create 1 os="ubuntu" release="precise" arches="amd64" subarches="*" labels="*" -maas maas boot-resources import maas maas sshkeys new key="`cat $HOME/.ssh/id_rsa.pub`" +#Added the Qtip public to run the Qtip test after install on bare metal nodes. +maas maas sshkeys new key="`cat ./maas/sshkeys/QtipKey.pub`" + #adding compute and control nodes VM to MAAS for deployment purpose. if [ "$virtinstall" -eq 1 ]; then # create two more VMs to do the deployment. @@ -142,11 +217,15 @@ if [ "$virtinstall" -eq 1 ]; then sudo virt-install --connect qemu:///system --name node2-compute --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node2-compute + sudo virt-install --connect qemu:///system --name node5-compute --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node5-compute + node1controlmac=`grep "mac address" node1-control | head -1 | cut -d "'" -f 2` node2computemac=`grep "mac address" node2-compute | head -1 | cut -d "'" -f 2` + node5computemac=`grep "mac address" node5-compute | head -1 | cut -d "'" -f 2` sudo virsh -c qemu:///system define --file node1-control sudo virsh -c qemu:///system define --file node2-compute + sudo virsh -c qemu:///system define --file node5-compute maas maas tags new name='control' maas maas tags new name='compute' @@ -159,32 +238,65 @@ if [ "$virtinstall" -eq 1 ]; then maas maas tag update-nodes compute add=$computenodeid + computenodeid=`maas maas nodes new autodetect_nodegroup='yes' name='node5-compute' tags='compute' hostname='node5-compute' power_type='virsh' mac_addresses=$node5computemac power_parameters_power_address='qemu+ssh://'$USER'@192.168.122.1/system' architecture='amd64/generic' power_parameters_power_id='node5-compute' | grep system_id | cut -d '"' -f 4 ` + + maas maas tag update-nodes compute add=$computenodeid fi +#read interface needed in Auto mode and enable it. Will be rmeoved once auto enablement will be implemented in the maas-deployer. +enable_if(){ + if [ -e ~/.juju/deployconfig.yaml ]; then + cp ~/.juju/deployconfig.yaml ./deployconfig.yaml + + enableiflist=`grep "interface-enable" deployconfig.yaml | cut -d ' ' -f 4 ` + datanet=`grep "dataNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'` + stornet=`grep "storageNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'` + pubnet=`grep "publicNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'` + + # split EXTERNAL_NETWORK=first ip;last ip; gateway;network + + if [ "$datanet" != "''" ]; then + EXTNET=(${enableiflist//,/ }) + i="0" + while [ ! -z "${EXTNET[i]}" ]; + do + enableautomode ${EXTNET[i]} AUTO $datanet || true + i=$[$i+1] + done + fi + if [ "$stornet" != "''" ]; then + EXTNET=(${enableiflist//,/ }) + i="0" + while [ ! -z "${EXTNET[i]}" ]; + do + enableautomode ${EXTNET[i]} AUTO $stornet || true + i=$[$i+1] + done + fi + if [ "$pubnet" != "''" ]; then + EXTNET=(${enableiflist//,/ }) + i="0" + while [ ! -z "${EXTNET[i]}" ]; + do + enableautomode ${EXTNET[i]} AUTO $pubnet || true + i=$[$i+1] + done + fi + fi +} + # Enable vlan interfaces with maas -case "$1" in - 'intelpod5' ) - maas refresh - crvlanupdsubnet vlan721 1 "DataNetwork" 721 2 || true - crvlanupdsubnet vlan724 2 "PublicNetwork" 724 3 || true - crnodevlanint $vlan721 || true - crnodevlanint $vlan724 || true - enableautomodebyname eth2.721 AUTO "10.4.9.0/24" compute || true - enableautomodebyname eth2.721 AUTO "10.4.9.0/24" control || true - ;; - 'intelpod6' ) - maas refresh - enableautomodebyname eth1 AUTO "10.4.9.0/24" compute || true - enableautomodebyname eth1 AUTO "10.4.9.0/24" control || true - ;; - 'orangepod2' ) +case "$labname" in + 'intelpod9' ) maas refresh - enableautomodebyname eth4 DHCP "192.168.22.0/24" compute || true - enableautomodebyname eth5 AUTO "192.168.12.0/24" compute || true - enableautomodebyname eth2 DHCP "192.168.22.0/24" control || true - enableautomodebyname eth3 AUTO "192.168.12.0/24" control || true - ;; - 'attvirpod1' ) + crvlanupdsubnet vlan902 1 "DataNetwork" 902 2 || true + crvlanupdsubnet vlan905 2 "PublicNetwork" 905 3 || true + crnodevlanint $vlan902 eth0 || true + crnodevlanint $vlan905 eth1 || true + enableautomodebyname eth0.902 AUTO "10.9.12.0/24" compute || true + enableautomodebyname eth1.905 AUTO "10.9.15.0/24" compute || true + enableautomodebyname eth0.902 AUTO "10.9.12.0/24" control || true + enableautomodebyname eth1.905 AUTO "10.9.15.0/24" control || true ;; 'juniperpod1' ) ;; @@ -192,15 +304,13 @@ case "$1" in maas refresh crvlanupdsubnet vlan1201 1 "DataNetwork" 1201 2 || true crvlanupdsubnet vlan1202 2 "PublicNetwork" 1202 3 || true - crnodevlanint $vlan1201 || true - crnodevlanint $vlan1202 || true - enableautomode eth2.1201 AUTO "172.16.121.3/24" compute || true - enableautomode eth2.1201 AUTO "172.16.121.3/24" control || true + crnodevlanint $vlan1201 eth1 || true + crnodevlanint $vlan1202 eth1 || true + enableautomode eth1.1201 AUTO "172.16.121.3/24" compute || true + enableautomode eth1.1201 AUTO "172.16.121.3/24" control || true ;; esac -echo " .... MAAS deployment finished successfully ...." - -#echo "... Deployment of opnfv release Started ...." -#python deploy.py $maas_ip +enable_if +echo " .... MAAS deployment finished successfully ...."