Rename rancher VM to nfs

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

3 files changed, 14 insertions, 19 deletions

diff --git a/deployment/heat/onap-rke/scripts/deploy.sh b/deployment/heat/onap-rke/scripts/deploy.sh
index ecefe2aaf..d26916e87 100755
--- a/deployment/heat/onap-rke/scripts/deploy.sh
+++ b/deployment/heat/onap-rke/scripts/deploy.sh
@@ -156,18 +156,18 @@ for n in $(seq 1 5); do
 
     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 @@ until ./rke up; do
     ./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
diff --git a/deployment/heat/onap-rke/scripts/gen-onap-oom-yaml.sh b/deployment/heat/onap-rke/scripts/gen-onap-oom-yaml.sh
index 45a0af0f2..32fe147dc 100755
--- a/deployment/heat/onap-rke/scripts/gen-onap-oom-yaml.sh
+++ b/deployment/heat/onap-rke/scripts/gen-onap-oom-yaml.sh
@@ -30,26 +30,26 @@ EOF
 cat $PARTS_DIR/onap-oom-1.yaml
 
 cat <<EOF
-  rancher_vm:
+  nfs_vm:
     type: OS::Nova::Server
     properties:
       name:
-        list_join: ['-', [{ get_param: 'OS::stack_name' }, 'rancher']]
+        list_join: ['-', [{ get_param: 'OS::stack_name' }, 'nfs']]
       image: { get_param: ubuntu_1804_image }
-      flavor: { get_param: rancher_vm_flavor }
+      flavor: { get_param: nfs_vm_flavor }
       key_name: { get_param: key_name }
       networks:
-      - port: { get_resource: rancher_private_port }
+      - port: { get_resource: nfs_private_port }
       user_data_format: RAW
       user_data:
         str_replace:
           template:
-            get_file: rancher_vm_entrypoint.sh
+            get_file: nfs_vm_entrypoint.sh
           params:
             __docker_proxy__: { get_param: docker_proxy }
             __apt_proxy__: { get_param: apt_proxy }
-            __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
-            __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] }
+            __nfs_ip_addr__: { get_attr: [nfs_floating_ip, floating_ip_address] }
+            __nfs_private_ip_addr__: { get_attr: [nfs_floating_ip, fixed_ip_address] }
             __integration_override_yaml__: { get_param: integration_override_yaml }
             __integration_gerrit_branch__: { get_param: integration_gerrit_branch }
             __integration_gerrit_refspec__: { get_param: integration_gerrit_refspec }
@@ -60,7 +60,6 @@ cat <<EOF
             __kubectl_version__: { get_param: kubectl_version }
             __helm_version__: { get_param: helm_version }
             __helm_deploy_delay__: { get_param: helm_deploy_delay }
-            __use_ramdisk__: { get_param: use_ramdisk }
             __mtu__: { get_param: mtu }
             __portal_hostname__: { get_param: portal_hostname }
             __public_net_id__: { get_param: public_net_id }
diff --git a/deployment/heat/onap-rke/scripts/redeploy.sh b/deployment/heat/onap-rke/scripts/redeploy.sh
index 1d46f025d..d18fab970 100755
--- a/deployment/heat/onap-rke/scripts/redeploy.sh
+++ b/deployment/heat/onap-rke/scripts/redeploy.sh
@@ -43,10 +43,6 @@ if [ $(kubectl get pods --namespace kube-system | tail -n +2 | grep -c Running)
     exit 1
 fi
 
-if [ ! -f /dockerdata-nfs/rancher_agent_cmd.sh ]; then
-    cp /root/rancher_agent_cmd.sh /dockerdata-nfs
-fi
-
 
 kubectl delete namespace $NS
 for op in secrets configmaps pvc pv services deployments statefulsets clusterrolebinding; do