commit d95bf2b91a8fc696fb3f002df589e90c460393df
author Gary Wu <gary.wu@futurewei.com> Fri Jun 21 15:35:18 2019 -0700
committer Yang Xu <yang.xu@futurewei.com> Fri Jun 21 22:54:41 2019 +0000
tree 8cde123f09cbe89a6d687782e91efd4b2db5ffe7
parent 6385045eff1596eb86a5d08c3746b2294f49928a

Rename rancher VM to nfs

Issue-ID: INT-1117
Signed-off-by: Gary Wu <gary.wu@futurewei.com>
Change-Id: I97b333d61c2f12036f5a2e864fab160eacfb8b69

deployment/heat/onap-rke/scripts/deploy.sh

diff --git a/deployment/heat/onap-rke/scripts/deploy.sh b/deployment/heat/onap-rke/scripts/deploy.sh
index ecefe2a..d26916e 100755
--- a/deployment/heat/onap-rke/scripts/deploy.sh
+++ b/deployment/heat/onap-rke/scripts/deploy.sh
@@ -156,18 +156,18 @@
 
     for i in $(seq 1 30); do
 	sleep 30
-	RANCHER_IP=$(openstack stack output show $stack_name rancher_vm_ip -c output_value -f value)
+	NFS_IP=$(openstack stack output show $stack_name nfs_vm_ip -c output_value -f value)
         K8S_IP=$(openstack stack output show $stack_name k8s_01_vm_ip -c output_value -f value)
-	timeout 1 ping -c 1 "$RANCHER_IP" && break
+	timeout 1 ping -c 1 "$NFS_IP" && break
     done
 
-    timeout 1 ping -c 1 "$RANCHER_IP" && break
+    timeout 1 ping -c 1 "$NFS_IP" && break
 
-    echo Error: OpenStack infrastructure issue: unable to reach rancher "$RANCHER_IP"
+    echo Error: OpenStack infrastructure issue: unable to reach NFS server "$NFS_IP"
     sleep 10
 done
 
-if ! timeout 1 ping -c 1 "$RANCHER_IP"; then
+if ! timeout 1 ping -c 1 "$NFS_IP"; then
     exit 2
 fi
 
@@ -270,11 +270,11 @@
     ./rke remove
 done
 
-scp -i $SSH_KEY ./kube_config_cluster.yml root@$RANCHER_IP:/root/.kube/config
+scp -i $SSH_KEY ./kube_config_cluster.yml root@$NFS_IP:/root/.kube/config
 popd
 
 
 sleep 2m
-ssh -o StrictHostKeychecking=no -i $SSH_KEY ubuntu@$RANCHER_IP "sed -u '/Cloud-init.*finished/q' <(tail -n+0 -f /var/log/cloud-init-output.log)"
+ssh -o StrictHostKeychecking=no -i $SSH_KEY ubuntu@$NFS_IP "sed -u '/Cloud-init.*finished/q' <(tail -n+0 -f /var/log/cloud-init-output.log)"
 
 exit 0