From: Bryan Sullivan Date: Mon, 11 Dec 2017 04:13:48 +0000 (-0800) Subject: Improve virsh use for cloudify-manager X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F25%2F48625%2F1;p=models.git Improve virsh use for cloudify-manager JIRA: MODELS-2 Change-Id: I7348c39ed57b0547514d70ae59bb24f8f590de4f Signed-off-by: Bryan Sullivan --- diff --git a/tools/cloudify/k8s-cloudify.sh b/tools/cloudify/k8s-cloudify.sh index 4b1067e..751ee32 100644 --- a/tools/cloudify/k8s-cloudify.sh +++ b/tools/cloudify/k8s-cloudify.sh @@ -78,8 +78,16 @@ function prereqs() { # workaround for virt-customize warning: libguestfs: warning: current user is not a member of the KVM group (group ID 121). This user cannot access /dev/kvm, so libguestfs may run very slowly. It is recommended that you 'chmod 0666 /dev/kvm' or add the current user to the KVM group (you might need to log out and log in again). # Also see: https://help.ubuntu.com/community/KVM/Installation # also to avoid permission denied errors in guestfish, from http://manpages.ubuntu.com/manpages/zesty/man1/guestfs-faq.1.html + sudo groupadd -g 7777 libvirt + sudo usermod -aG libvirt $USER + id $USER | grep libvirt + sudo tee -a /etc/libvirt/libvirtd.conf < /dev/null 2>&1 & + --os-variant=rhel7 --noautoconsole + # TODO: centos requires sudo for some reason + if [[ "$USER" == "centos" ]]; then dosudo=sudo; fi VM_IP="" n=0 while [[ "x$VM_IP" == "x" ]]; do - log "$n minutes so far; waiting 60 seconds for cloudify-manager IP to be assigned" - sleep 60 + log "$n minutes so far; waiting 10 seconds for cloudify-manager IP to be assigned" + sleep 10 ((n++)) - VM_MAC=$(sudo virsh domiflist cloudify-manager | grep default | grep -Eo "[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+") + VM_MAC=$($dosudo virsh domiflist cloudify-manager | grep default | grep -Eo "[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+") VM_IP=$(/usr/sbin/arp -e | grep ${VM_MAC} | awk {'print $1'}) done log "cloudify-manager IP=$VM_IP" @@ -157,7 +173,7 @@ function setup () { cfy secrets list # get manager VM IP - VM_MAC=$(sudo virsh domiflist cloudify-manager | grep default | grep -Eo "[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+") + VM_MAC=$(virsh domiflist cloudify-manager | grep default | grep -Eo "[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+") VM_IP=$(/usr/sbin/arp -e | grep ${VM_MAC} | awk {'print $1'}) # get host IP