X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=prototypes%2Fxci%2Fxci-deploy.sh;h=3a65983ac5250c350c39d3b6808bdff3db7c9a7b;hb=5405777dc08714eadf8020c9f9b6a8dfcbf7d48c;hp=2fd9be022fb13b181f55ab6fbdb7b94576063ebc;hpb=132fecf179dfcbaa7a39eabee0a65762600077d1;p=releng.git

diff --git a/prototypes/xci/xci-deploy.sh b/prototypes/xci/xci-deploy.sh
index 2fd9be022..3a65983ac 100755
--- a/prototypes/xci/xci-deploy.sh
+++ b/prototypes/xci/xci-deploy.sh
@@ -4,11 +4,13 @@ set -o nounset
 set -o pipefail
 
 #-------------------------------------------------------------------------------
-# This script must run as root
+# This script should not be run as root
 #-------------------------------------------------------------------------------
-if [[ $(whoami) != "root" ]]; then
-    echo "Error: This script must be run as root!"
-    exit 1
+if [[ $(whoami) == "root" ]]; then
+    echo "WARNING: This script should not be run as root!"
+    echo "Elevated privileges are aquired automatically when necessary"
+    echo "Waiting 10s to give you a chance to stop the script (Ctrl-C)"
+    for x in $(seq 10 -1 1); do echo -n "$x..."; sleep 1; done
 fi
 
 #-------------------------------------------------------------------------------
@@ -50,7 +52,7 @@ echo "-------------------------------------------------------------------------"
 #-------------------------------------------------------------------------------
 # Install ansible on localhost
 #-------------------------------------------------------------------------------
-pip install ansible==$XCI_ANSIBLE_PIP_VERSION
+source file/install-ansible.sh
 
 # TODO: The xci playbooks can be put into a playbook which will be done later.
 
@@ -137,7 +139,7 @@ echo "Info: Configured target hosts"
 #-------------------------------------------------------------------------------
 echo "Info: Setting up target hosts for openstack-ansible"
 echo "-----------------------------------------------------------------------"
-sudo -E /bin/sh -c "ssh root@$OPNFV_HOST_IP openstack-ansible \
+ssh root@$OPNFV_HOST_IP "openstack-ansible \
      $OPENSTACK_OSA_PATH/playbooks/setup-hosts.yml" | \
      tee $LOG_PATH/setup-hosts.log
 echo "-----------------------------------------------------------------------"
@@ -156,7 +158,7 @@ echo "Info: Set up target hosts for openstack-ansible successfuly"
 echo "Info: Setting up infrastructure"
 echo "-----------------------------------------------------------------------"
 echo "xci: running ansible playbook setup-infrastructure.yml"
-sudo -E /bin/sh -c "ssh root@$OPNFV_HOST_IP openstack-ansible \
+ssh root@$OPNFV_HOST_IP "openstack-ansible \
      $OPENSTACK_OSA_PATH/playbooks//setup-infrastructure.yml" | \
      tee $LOG_PATH/setup-infrastructure.log
 echo "-----------------------------------------------------------------------"
@@ -171,7 +173,7 @@ fi
 #-------------------------------------------------------------------------------
 echo "Info: Verifying database cluster"
 echo "-----------------------------------------------------------------------"
-sudo -E /bin/sh -c "ssh root@$OPNFV_HOST_IP ansible -i $OPENSTACK_OSA_PATH/playbooks/inventory/ \
+ssh root@$OPNFV_HOST_IP "ansible -i $OPENSTACK_OSA_PATH/playbooks/inventory/ \
            galera_container -m shell \
            -a "mysql -h localhost -e 'show status like \"%wsrep_cluster_%\";'"" \
            | tee $LOG_PATH/galera.log
@@ -190,7 +192,7 @@ echo "Info: Database cluster verification successful!"
 #-------------------------------------------------------------------------------
 echo "Info: Installing OpenStack on target hosts"
 echo "-----------------------------------------------------------------------"
-sudo -E /bin/sh -c "ssh root@$OPNFV_HOST_IP openstack-ansible \
+ssh root@$OPNFV_HOST_IP "openstack-ansible \
      $OPENSTACK_OSA_PATH/playbooks/setup-openstack.yml" | \
      tee $LOG_PATH/opnfv-setup-openstack.log
 echo "-----------------------------------------------------------------------"