'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
;;
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.
+#make sure no password asked during the deployment.
echo "$USER ALL=(ALL) NOPASSWD:ALL" > 90-joid-init
sudo apt-add-repository ppa:maas/stable -y
sudo apt-add-repository cloud-archive:liberty -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 -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
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'
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
- crvlanupdsubnet vlan721 1 "DataNetwork" 721 2 || true
- crvlanupdsubnet vlan724 2 "PublicNetwork" 724 3 || true
- crnodevlanint $vlan721 eth2|| true
- crnodevlanint $vlan724 eth2|| true
- enableautomodebyname eth2.721 AUTO "10.4.9.0/24" compute || true
- enableautomodebyname eth2.721 AUTO "10.4.9.0/24" control || true
+ enableautomodebyname eth4 AUTO "10.5.12.0/24" compute || true
+ enableautomodebyname eth4 AUTO "10.5.12.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
+ enableautomodebyname eth4 AUTO "10.6.12.0/24" compute || true
+ enableautomodebyname eth4 AUTO "10.6.12.0/24" control || true
;;
'orangepod2' )
maas refresh
enableautomodebyname eth3 AUTO "192.168.12.0/24" control || true
;;
'attvirpod1' )
+ enableautomodebyname eth1 AUTO "192.168.10.0/24" control || true
;;
'juniperpod1' )
;;
#echo "... Deployment of opnfv release Started ...."
#python deploy.py $maas_ip
-