X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2F02-maasdeploy.sh;h=cc41ecf10e19bb588234cda99f901f852c4d91d6;hb=2019d07fcf8aed6f456a25ba6d69bbfac93ffe18;hp=8ef8565e5803302106251488b0f93f2c27fbe412;hpb=69130c6d87ad05e9ea793eb4fd2fc99bd4307778;p=joid.git diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh index 8ef8565e..cc41ecf1 100755 --- a/ci/02-maasdeploy.sh +++ b/ci/02-maasdeploy.sh @@ -11,6 +11,9 @@ case "$1" in 'intelpod6' ) cp maas/intel/pod6/deployment.yaml ./deployment.yaml ;; + 'orangepod1' ) + cp maas/orange/pod1/deployment.yaml ./deployment.yaml + ;; 'orangepod2' ) cp maas/orange/pod2/deployment.yaml ./deployment.yaml ;; @@ -20,20 +23,33 @@ case "$1" in 'juniperpod1' ) cp maas/juniper/pod1/deployment.yaml ./deployment.yaml ;; + 'cengnlynxpod1' ) + cp maas/cengn_lynx/pod1/deployment.yaml ./deployment.yaml + ;; + 'custom' ) + cp maas/custom/deployment.yaml ./deployment.yaml + ;; * ) virtinstall=1 + ./cleanvm.sh cp maas/default/deployment.yaml ./deployment.yaml ;; esac -#make sure no password asked during the deployment. +#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 + +#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 - cp /etc/sudoers.d/90-joid-init 91-joid-init - cat 90-joid-init >> 91-joid-init - sudo chown root:root 90-joid-init + sudo cp /etc/sudoers.d/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 sudo chown root:root 90-joid-init @@ -46,21 +62,29 @@ if [ ! -e $HOME/.ssh/id_rsa ]; then ssh-keygen -N '' -f $HOME/.ssh/id_rsa fi -if [ ! -e /var/lib/libvirt/images ]; then - - 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 +#define the pool and try to start even though its already exist. +# For fresh install this may or may not there. -fi +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 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:liberty -y sudo apt-get update -y -sudo apt-get install openssh-server git maas-deployer juju juju-deployer maas-cli python-pip -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 gsutil -y + +# 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 pip install shyaml juju init -f @@ -75,6 +99,49 @@ if [ "$virtinstall" -eq 1 ]; then sudo virsh net-start default fi +#Below function will mark the interfaces in Auto mode to enbled by MAAS +enableautomode() { + listofnodes=`maas maas nodes list | grep system_id | cut -d '"' -f 4` + for nodes in $listofnodes + do + maas maas interface link-subnet $nodes $1 mode=$2 subnet=$3 + done +} + +#Below function will mark the interfaces in Auto mode to enbled by MAAS +# using hostname of the node added into MAAS + +enableautomodebyname() { + if [ ! -z "$4" ]; then + for i in `seq 1 7`; + do + nodes=`maas maas nodes list hostname=node$i-$4 | grep system_id | cut -d '"' -f 4` + if [ ! -z "$nodes" ]; then + maas maas interface link-subnet $nodes $1 mode=$2 subnet=$3 + fi + done + fi +} + +#Below function will create vlan and update interface with the new vlan +# will return the vlan id created +crvlanupdsubnet() { + newvlanid=`maas maas vlans create $2 name=$3 vid=$4 | grep resource | cut -d '/' -f 6 ` + maas maas subnet update $5 vlan=$newvlanid + eval "$1"="'$newvlanid'" +} + +#Below function will create interface with new vlan and bind to physical interface +crnodevlanint() { + listofnodes=`maas maas nodes list | grep system_id | cut -d '"' -f 4` + + for nodes in $listofnodes + do + parentid=`maas maas interface read $nodes $2 | grep interfaces | cut -d '/' -f 8` + maas maas interfaces create-vlan $nodes vlan=$1 parent=$parentid + done + } + sudo maas-deployer -c deployment.yaml -d --force sudo chown $USER:$USER environments.yaml @@ -86,21 +153,28 @@ 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 node-groups import-boot-images 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. - sudo virt-install --connect qemu:///system --name node1-control --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node1-control + sudo virt-install --connect qemu:///system --name node1-control --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 node1-control - 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 --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node2-compute + 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 - node1controlmac=`grep "mac address" node1-control | cut -d "'" -f 2` - node2computemac=`grep "mac address" node2-compute | cut -d "'" -f 2` + 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' @@ -113,8 +187,47 @@ 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 +# Enable vlan interfaces with maas +case "$1" in + 'intelpod5' ) + maas refresh + enableautomodebyname eth4 AUTO "10.5.12.0/24" compute || true + enableautomodebyname eth4 AUTO "10.5.12.0/24" control || true + ;; + 'intelpod6' ) + maas refresh + enableautomodebyname eth4 AUTO "10.6.12.0/24" compute || true + enableautomodebyname eth4 AUTO "10.6.12.0/24" control || true + ;; + 'orangepod2' ) + 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' ) + enableautomodebyname eth1 AUTO "192.168.10.0/24" control || true + ;; + 'juniperpod1' ) + ;; + 'cengnlynxpod1' ) + maas refresh + crvlanupdsubnet vlan1201 1 "DataNetwork" 1201 2 || true + crvlanupdsubnet vlan1202 2 "PublicNetwork" 1202 3 || 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 -