sudo apt-add-repository cloud-archive:ocata -y
sudo apt-get update -y
#sudo apt-get dist-upgrade -y
-sudo apt-get install bridge-utils openssh-server bzr git virtinst qemu-kvm libvirt-bin juju \
- maas maas-region-controller python-pip python-psutil python-openstackclient \
+sudo apt-get install bridge-utils openssh-server bzr git virtinst qemu-kvm libvirt-bin \
+ maas maas-region-controller juju python-pip python-psutil python-openstackclient \
python-congressclient gsutil charm-tools pastebinit python-jinja2 sshpass \
- openssh-server vlan ipmitool jq expect -y
+ openssh-server vlan ipmitool jq expect snap -y
-sudo pip install --upgrade pip
+#sudo apt-get install snap -y
+#sudo snap install maas --classic
+#sudo snap install juju --classic
+
+sudo -H pip install --upgrade pip
#first parameter should be custom and second should be either
# absolute location of file (including file name) or url of the
# define the pool and try to start even though its already exist.
# For fresh install this may or may not there.
-sudo adduser $USER libvirtd
+#some system i am seeing libvirt and some have libvirtd looks like libvirt-bin is
+#keep switching so lets try both.
+
+sudo adduser $USER libvirtd || true
+sudo adduser $USER libvirt || true
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
# In case of virtual install set network
if [ "$virtinstall" -eq 1 ]; then
sudo virsh net-dumpxml default > default-net-org.xml
- sudo sed -i '/dhcp/d' default-net-org.xml
- sudo sed -i '/range/d' default-net-org.xml
- sudo virsh net-define default-net-org.xml
+ sed -i '/dhcp/d' default-net-org.xml
+ sed -i '/range/d' default-net-org.xml
sudo virsh net-destroy default
+ sudo virsh net-define default-net-org.xml
sudo virsh net-start default
rm -f default-net-org.xml
fi
# 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
+if [ $(pip list --format=columns | grep google-api-python-client | wc -l) == 1 ]; then
sudo pip uninstall google-api-python-client
fi
*) JUJU_SPACE='default'; DHCP='OFF'; echo " >>> Unknown SPACE" ;;
esac
JUJU_SPACE_ID=$(maas $PROFILE spaces read | jq -r ".[] | select(.name==\"$JUJU_SPACE\")".id)
- if ([ $NET_FABRIC_NAME ] && [ $NET_FABRIC_NAME != "null" ]); then
- maas $PROFILE subnet update $SPACE_CIDR space=$JUJU_SPACE_ID
+ JUJU_VLAN_VID=$(maas $PROFILE subnets read | jq -r ".[] | select(.name==\"$SPACE_CIDR\")".vlan.vid)
+ NET_FABRIC_ID=$(maas $PROFILE fabric read $NET_FABRIC_NAME | jq -r ".id")
+ if ([ $NET_FABRIC_ID ] && [ $NET_FABRIC_ID != "null" ]); then
+ if ([ $JUJU_VLAN_VID ] && [ $JUJU_VLAN_VID != "null" ]); then
+ maas $PROFILE vlan update $NET_FABRIC_ID $JUJU_VLAN_VID space=$JUJU_SPACE_ID
+ fi
fi
if ([ $type == "admin" ]); then
# If we have a network, we create it
# if we have a virshurl configuration we use it, else we use local
VIRSHURL=$(cat labconfig.json | jq -r '.opnfv.virshurl')
if ([ $VIRSHURL == "" ] || [ "$VIRSHURL" == "null" ]); then
- VIRSHURL="qemu+ssh://$USER@$MAAS_IP/system "
+ VIRSHIP=$MAAS_IP
+ VIRSHURL="qemu+ssh://$USER@$VIRSHIP/system "
VIRSHHOST=""
else
VIRSHHOST=$(echo $VIRSHURL| cut -d\/ -f 3 | cut -d@ -f2)
+ VIRSHIP="" # TODO: parse from $VIRSHURL if needed
fi
if [ "$virtinstall" -eq 1 ]; then
done
fi
+ # Add server fingerprint to known hosts to prevent security prompt in the
+ # SSH connection during the virt-install
+ if [ $VIRSHIP != "" ]; then
+ # Check if the IP is not already present among the known hosts
+ if ! ssh-keygen -F $VIRSHIP > /dev/null ; then
+ echo "SSH fingerprint of the host is not known yet, adding"
+ ssh-keyscan -H $VIRSHIP >> ~/.ssh/known_hosts
+ fi
+ fi
+
virt-install --connect $VIRSHURL --name bootstrap --ram 4098 --cpu host --vcpus 2 --video \
cirrus --arch x86_64 --disk size=20,format=qcow2,bus=virtio,cache=directsync,io=native,pool=default \
$netw --boot network,hd,menu=off --noautoconsole \
units=$(($units - 1));
NODE_NAME=`cat labconfig.json | jq ".lab.racks[].nodes[$units].name" | cut -d \" -f 2 `
- sudo virt-install --connect $VIRSHURL --name $NODE_NAME --ram 8192 --cpu host --vcpus 4 \
+ virt-install --connect $VIRSHURL --name $NODE_NAME --ram 8192 --cpu host --vcpus 4 \
--disk size=120,format=qcow2,bus=virtio,cache=directsync,io=native,pool=default \
$netw $netw --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee $NODE_NAME
nodemac=`grep "mac address" $NODE_NAME | head -1 | cut -d '"' -f 2`
- sudo virsh -c $VIRSHURL --file $NODE_NAME
+ virsh -c $VIRSHURL define --file $NODE_NAME
rm -f $NODE_NAME
maas $PROFILE machines create autodetect_nodegroup='yes' name=$NODE_NAME \
tags='control compute' hostname=$NODE_NAME power_type='virsh' mac_addresses=$nodemac \
units=$(($units - 1));
NODE_NAME=`cat labconfig.json | jq ".lab.racks[].nodes[$units].name" | cut -d \" -f 2 `
MAC_ADDRESS=`cat labconfig.json | jq ".lab.racks[].nodes[$units].nics[] | select(.spaces[]==\"admin\").mac"[0] | cut -d \" -f 2 `
+ MAC_ADDRESS1=`cat labconfig.json | jq ".lab.racks[].nodes[$units].nics[] | select(.spaces[]==\"floating\").mac"[0] | cut -d \" -f 2 `
POWER_TYPE=`cat labconfig.json | jq ".lab.racks[].nodes[$units].power.type" | cut -d \" -f 2 `
POWER_IP=`cat labconfig.json | jq ".lab.racks[].nodes[$units].power.address" | cut -d \" -f 2 `
POWER_USER=`cat labconfig.json | jq ".lab.racks[].nodes[$units].power.user" | cut -d \" -f 2 `
maas $PROFILE machines create autodetect_nodegroup='yes' name=$NODE_NAME \
hostname=$NODE_NAME power_type=$POWER_TYPE power_parameters_power_address=$POWER_IP \
power_parameters_power_user=$POWER_USER power_parameters_power_pass=$POWER_PASS mac_addresses=$MAC_ADDRESS \
- architecture='amd64/generic'
+ mac_addresses=$MAC_ADDRESS1 architecture='amd64/generic'
done
fi
- # make sure nodes are added into MAAS and none of them is in commisoning state
- while [ "$(maas $PROFILE nodes read | grep Commissioning )" ];
+ maas $PROFILE pods create type=virsh power_address="$VIRSHURL" power_user=$USER
+
+ # Make sure nodes are added into MAAS and none of them is in commissioning state
+ while [ "$(maas $PROFILE nodes read | grep Commissioning )" ];
do
sleep 60
+
+ # Make sure that no nodes have failed commissioning or testing
+ if [ "$(maas $PROFILE nodes read | grep 'Failed' )" ];
+ then
+ echo "Error: Some nodes have failed commissioning or testing" 1>&2
+ exit 1
+ fi
+
done
}
sudo ./maas-reconfigure-region.sh $MAAS_IP
sleep 120
-#lets add the nodes now. Currently works only for virtual deploymnet.
+# Let's add the nodes now. Currently works only for virtual deployment.
addnodes
echo "... Deployment of maas finish ...."
Code Review / joid.git / blobdiff