Restructuring the repo.

The idea is to restructure the existing repo create a deployment
independent of Vagrant or other hosting providers.
Renamed KRD to KUbernetes Deploy(Kud) including the ansible scripts
Added new path to functional tests.
Moved samples pdfs to sites.
Minor changes to Readme.
Updated aio.sh, moved sample config
Corrected other nits. Updated and verified test cases.
Addressed comments and changes associated with it.
Updated Readme and minor change in Vagrantfile.
Validated test cases again. Moved aio.sh into vagrant folder.
Added new README for each hosting provider and project on the whole.
Updated the installer script with relative path.
Updated the name to deployment_infra, moved the cFW sripcts to tests.
Updated the gitignore file.

Issue-ID: MULTICLOUD-301
Change-Id: Ie48c26b12ab58b604493fba58a9c5b9f8ba10942
Signed-off-by: Akhila Kishore <akhila.kishore@intel.com>

132 files changed, 142 insertions, 101 deletions

diff --git a/.gitignore b/.gitignore
index 1e570c18..1b74ba09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,10 +30,10 @@ src/k8splugin/plugins/**/*.so
 
 # KRD
 .vagrant/
-vagrant/inventory/hosts.ini
-vagrant/inventory/artifacts
-vagrant/inventory/group_vars/all.yml
-vagrant/config/pdf.yml
-vagrant/sources.list
+kud/hosting_providers/vagrant/inventory/hosts.ini
+kud/hosting_providers/vagrant/inventory/artifacts
+kud/hosting_providers/vagrant/inventory/group_vars/all.yml
+kud/hosting_providers/vagrant/config/pdf.yml
+kud/hosting_providers/vagrant/sources.list
 *.retry
 *.vdi
diff --git a/vagrant/README.md b/kud/README.md
index c433a607..20640424 100644
--- a/vagrant/README.md
+++ b/kud/README.md
@@ -1,54 +1,37 @@
-# Kubernetes Reference Deployment
+# Kubernetes Deployment
 
 ## Summary
 
-This project offers a reference for deploying a Kubernetes cluster
+This project offers a means for deploying a Kubernetes cluster
 that satisfies the requirements of [ONAP multicloud/k8s plugin][1]. Its
-ansible playbooks allow to provision a deployment on Bare-metal or
-Virtual Machines.
+ansible playbooks allow to provision a deployment on Virtual Machines and on Baremetal.
 
-![Diagram](../doc/img/diagram.png)
+![Diagram](../../../docs/img/diagram.png)
 
 # Components
 
 | Name           | Description                                   | Source                            | Status |
 |:--------------:|:----------------------------------------------|:----------------------------------|:------:|
 | Kubernetes     | Base Kubernetes deployment                    | [kubespray][2]                    | Done   |
-| ovn-kubernetes | Integrates Opensource Virtual Networking      | [configure-ovn-kubernetes.yml][3] | Tested |
+| ovn4nfv        | Integrates Opensource Virtual Networking      | [configure-ovn4nfv.yml][3]        | Tested |
 | Virtlet        | Allows to run VMs                             | [configure-virtlet.yml][4]        | Tested |
 | Multus         | Provides Multiple Network support in a pod    | [configure-multus.yml][5]         | Tested |
-| NFD            | Node feature discovery                        | [configure-nfd.yml][7]            | Tested |
-| Istio          | Service Mesh platform                         | [configure-istio.yml][8]          | Tested |
+| NFD            | Node feature discovery                        | [configure-nfd.yml][6]            | Tested |
+| Istio          | Service Mesh platform                         | [configure-istio.yml][7]          | Tested |
 
 ## Deployment
 
 The [installer](installer.sh) bash script contains the minimal
 Ubuntu instructions required for running this project.
 
-### Virtual Machines
-
-This project uses [Vagrant tool][6] for provisioning Virtual Machines
-automatically. The [setup](setup.sh) bash script contains the
-Linux instructions to install dependencies and plugins required for
-its usage. This script supports two Virtualization technologies
-(Libvirt and VirtualBox).
-
-    $ ./setup.sh -p libvirt
-
-Once Vagrant is installed, it's possible to provision a cluster using
-the following instructions:
-
-    $ vagrant up && vagrant up installer
-
 ## License
 
 Apache-2.0
 
 [1]: https://git.onap.org/multicloud/k8s
 [2]: https://github.com/kubernetes-incubator/kubespray
-[3]: playbooks/configure-ovn-kubernetes.yml
+[3]: playbooks/configure-ovn4nfv.yml
 [4]: playbooks/configure-virtlet.yml
 [5]: playbooks/configure-multus.yml
-[6]: https://www.vagrantup.com/
-[7]: playbooks/configure-nfd.yml
-[8]: playbooks/configure-istio.yml
+[6]: playbooks/configure-nfd.yml
+[7]: playbooks/configure-istio.yml
diff --git a/vagrant/galaxy-requirements.yml b/kud/deployment_infra/galaxy-requirements.yml
index 5d232451..5d232451 100644
--- a/vagrant/galaxy-requirements.yml
+++ b/kud/deployment_infra/galaxy-requirements.yml
diff --git a/vagrant/playbooks/Debian.yml b/kud/deployment_infra/playbooks/Debian.yml
index 96357fe2..96357fe2 100644
--- a/vagrant/playbooks/Debian.yml
+++ b/kud/deployment_infra/playbooks/Debian.yml
diff --git a/vagrant/playbooks/RedHat.yml b/kud/deployment_infra/playbooks/RedHat.yml
index fe839bbd..fe839bbd 100644
--- a/vagrant/playbooks/RedHat.yml
+++ b/kud/deployment_infra/playbooks/RedHat.yml
diff --git a/vagrant/playbooks/Suse.yml b/kud/deployment_infra/playbooks/Suse.yml
index 17d1147c..17d1147c 100644
--- a/vagrant/playbooks/Suse.yml
+++ b/kud/deployment_infra/playbooks/Suse.yml
diff --git a/vagrant/playbooks/configure-istio.yml b/kud/deployment_infra/playbooks/configure-istio.yml
index 2bd4e853..72542e5a 100644
--- a/vagrant/playbooks/configure-istio.yml
+++ b/kud/deployment_infra/playbooks/configure-istio.yml
@@ -10,9 +10,9 @@
 
 - hosts: localhost
   pre_tasks:
-    - name: Load krd variables
+    - name: Load kud variables
       include_vars:
-        file: krd-vars.yml
+        file: kud-vars.yml
   roles:
     - role: andrewrothstein.kubectl
       kubectl_ver: "v{{ kubectl_version }}"
diff --git a/vagrant/playbooks/configure-krd.yml b/kud/deployment_infra/playbooks/configure-kud.yml
index 22e6419f..9dcf6f39 100644
--- a/vagrant/playbooks/configure-krd.yml
+++ b/kud/deployment_infra/playbooks/configure-kud.yml
@@ -12,5 +12,5 @@
   tasks:
     - name: copy admin.conf file to kube-nodes
       copy:
-        src: "{{ lookup('env','krd_inventory_folder') }}/artifacts/admin.conf"
+        src: "{{ lookup('env','kud_inventory_folder') }}/artifacts/admin.conf"
         dest: "/etc/kubernetes/admin.conf"
diff --git a/vagrant/playbooks/configure-multus.yml b/kud/deployment_infra/playbooks/configure-multus.yml
index 23fe546a..1f6d6ce9 100644
--- a/vagrant/playbooks/configure-multus.yml
+++ b/kud/deployment_infra/playbooks/configure-multus.yml
@@ -10,9 +10,9 @@
 - hosts: kube-node
   become: yes
   pre_tasks:
-    - name: Load krd variables
+    - name: Load kud variables
       include_vars:
-        file: krd-vars.yml
+        file: kud-vars.yml
   roles:
     - role: andrewrothstein.go
       go_ver: "{{ go_version }}"
@@ -81,9 +81,9 @@
 
 - hosts: localhost
   pre_tasks:
-    - name: Load krd variables
+    - name: Load kud variables
       include_vars:
-        file: krd-vars.yml
+        file: kud-vars.yml
   roles:
     - role: andrewrothstein.kubectl
       kubectl_ver: "v{{ kubectl_version }}"
diff --git a/vagrant/playbooks/configure-nfd.yml b/kud/deployment_infra/playbooks/configure-nfd.yml
index d47a7bcc..a091d04b 100644
--- a/vagrant/playbooks/configure-nfd.yml
+++ b/kud/deployment_infra/playbooks/configure-nfd.yml
@@ -10,9 +10,9 @@
 
 - hosts: kube-node
   tasks:
-    - name: Load krd variables
+    - name: Load kud variables
       include_vars:
-        file: krd-vars.yml
+        file: kud-vars.yml
     - name: clone NFD repo
       git:
         repo: "{{ nfd_url }}"
@@ -47,9 +47,9 @@
 
 - hosts: localhost
   pre_tasks:
-    - name: Load krd variables
+    - name: Load kud variables
       include_vars:
-        file: krd-vars.yml
+        file: kud-vars.yml
   roles:
     - role: andrewrothstein.kubectl
       kubectl_ver: "v{{ kubectl_version }}"
diff --git a/vagrant/playbooks/configure-ovn-kubernetes.yml b/kud/deployment_infra/playbooks/configure-ovn-kubernetes.yml
index e3042ff4..5f1c9f64 100644
--- a/vagrant/playbooks/configure-ovn-kubernetes.yml
+++ b/kud/deployment_infra/playbooks/configure-ovn-kubernetes.yml
@@ -15,16 +15,16 @@
   environment:
     PATH: "{{ ansible_env.PATH }}:/usr/local/go/bin/"
   pre_tasks:
-    - name: Load krd variables
+    - name: Load kud variables
       include_vars:
-        file: krd-vars.yml
+        file: kud-vars.yml
   roles:
     - role: andrewrothstein.go
       go_ver: "{{ go_version }}"
   tasks:
-    - name: Load krd variables
+    - name: Load kud variables
       include_vars:
-        file: krd-vars.yml
+        file: kud-vars.yml
     - name: clone ovn-kubernetes repo
       git:
         repo: "{{ ovn_kubernetes_url }}"
diff --git a/vagrant/playbooks/configure-ovn.yml b/kud/deployment_infra/playbooks/configure-ovn.yml
index 3fd2c765..3fd2c765 100644
--- a/vagrant/playbooks/configure-ovn.yml
+++ b/kud/deployment_infra/playbooks/configure-ovn.yml
diff --git a/vagrant/playbooks/configure-ovn4nfv.yml b/kud/deployment_infra/playbooks/configure-ovn4nfv.yml
index c864b8c3..f8dabd9d 100644
--- a/vagrant/playbooks/configure-ovn4nfv.yml
+++ b/kud/deployment_infra/playbooks/configure-ovn4nfv.yml
@@ -16,9 +16,9 @@
   roles:
     - role: andrewrothstein.go
   tasks:
-    - name: Load krd variables
+    - name: Load kud variables
       include_vars:
-        file: krd-vars.yml
+        file: kud-vars.yml
     - name: clone ovn4nfv-k8s-plugin repo
       git:
         repo: "{{ ovn4nfv_url }}"
@@ -66,9 +66,9 @@
     PATH: "{{ ansible_env.PATH }}:/usr/local/go/bin/"
   become: yes
   tasks:
-    - name: Load krd variables
+    - name: Load kud variables
       include_vars:
-        file: krd-vars.yml
+        file: kud-vars.yml
     - name: build ovn4nfvk8s
       make:
         chdir: "{{ ovn4nfv_dest }}"
diff --git a/vagrant/playbooks/configure-virtlet.yml b/kud/deployment_infra/playbooks/configure-virtlet.yml
index 44c87a48..753e487e 100644
--- a/vagrant/playbooks/configure-virtlet.yml
+++ b/kud/deployment_infra/playbooks/configure-virtlet.yml
@@ -11,9 +11,9 @@
   vars:
     images_file: /tmp/images.yaml
   pre_tasks:
-    - name: Load krd variables
+    - name: Load kud variables
       include_vars:
-        file: krd-vars.yml
+        file: kud-vars.yml
   roles:
     - role: andrewrothstein.kubectl
       kubectl_ver: "v{{ kubectl_version }}"
@@ -143,9 +143,9 @@
 
 - hosts: virtlet
   tasks:
-    - name: Load krd variables
+    - name: Load kud variables
       include_vars:
-        file: krd-vars.yml
+        file: kud-vars.yml
     - name: create CRIProxy binary folder
       file:
         state: directory
diff --git a/vagrant/playbooks/krd-vars.yml b/kud/deployment_infra/playbooks/kud-vars.yml
index d6bd0ee6..d6bd0ee6 100644
--- a/vagrant/playbooks/krd-vars.yml
+++ b/kud/deployment_infra/playbooks/kud-vars.yml
diff --git a/kud/hosting_providers/baremetal/README.md b/kud/hosting_providers/baremetal/README.md
new file mode 100644
index 00000000..4f81d7b5
--- /dev/null
+++ b/kud/hosting_providers/baremetal/README.md
@@ -0,0 +1,22 @@
+# Kubernetes Deployment
+
+## Summary
+
+This project offers a means for deploying a Kubernetes cluster
+that satisfies the requirements of [ONAP multicloud/k8s plugin][1]. Its
+ansible playbooks allow to provision a deployment on Baremetal. 
+
+
+![Diagram](../../../docs/img/installer_workflow.png)
+
+
+## Deployment
+
+The [installer](installer.sh) bash script contains the minimal
+Ubuntu instructions required for running this project.
+
+## License
+
+Apache-2.0
+
+[1]: https://git.onap.org/multicloud/k8s
diff --git a/kud/hosting_providers/vagrant/README.md b/kud/hosting_providers/vagrant/README.md
new file mode 100644
index 00000000..00f0a70f
--- /dev/null
+++ b/kud/hosting_providers/vagrant/README.md
@@ -0,0 +1,36 @@
+# Kubernetes Deployment
+
+## Summary
+
+This project offers a means for deploying a Kubernetes cluster
+that satisfies the requirements of [ONAP multicloud/k8s plugin][1]. Its
+ansible playbooks allow to provision a deployment on Virtual Machines.
+
+![Diagram](../../../docs/img/diagram.png)
+
+## Deployment
+
+The [installer](installer.sh) bash script contains the minimal
+Ubuntu instructions required for running this project.
+
+### Virtual Machines
+
+This project uses [Vagrant tool][2] for provisioning Virtual Machines
+automatically. The [setup](setup.sh) bash script contains the
+Linux instructions to install dependencies and plugins required for
+its usage. This script supports two Virtualization technologies
+(Libvirt and VirtualBox).
+
+    $ ./setup.sh -p libvirt
+
+Once Vagrant is installed, it's possible to provision a cluster using
+the following instructions:
+
+    $ vagrant up && vagrant up installer
+
+## License
+
+Apache-2.0
+
+[1]: https://git.onap.org/multicloud/k8s
+[2]: https://www.vagrantup.com/
diff --git a/vagrant/Vagrantfile b/kud/hosting_providers/vagrant/Vagrantfile
index 3314fe94..105c7e99 100644
--- a/vagrant/Vagrantfile
+++ b/kud/hosting_providers/vagrant/Vagrantfile
@@ -115,15 +115,15 @@ Vagrant.configure("2") do |config|
   config.vm.define :installer, primary: true, autostart: false do |installer|
     installer.vm.hostname = "multicloud"
     installer.vm.network :private_network, :ip => "10.10.10.2", :type => :static
-    installer.vm.synced_folder '../', '/home/vagrant/multicloud-k8s/', type: sync_type
+    installer.vm.synced_folder '../../../', '/home/vagrant/multicloud-k8s/', type: sync_type
     installer.vm.provision 'shell', privileged: false do |sh|
-      sh.env = {'KRD_PLUGIN_ENABLED': 'true'}
+      sh.env = {'KUD_PLUGIN_ENABLED': 'true'}
       sh.inline = <<-SHELL
         cp /vagrant/insecure_keys/key.pub /home/vagrant/.ssh/id_rsa.pub
         cp /vagrant/insecure_keys/key /home/vagrant/.ssh/id_rsa
         chown vagrant /home/vagrant/.ssh/id_rsa
         chmod 400 /home/vagrant/.ssh/id_rsa
-        cd /home/vagrant/multicloud-k8s/vagrant/ && ./installer.sh | tee krd_installer.log
+        cd /home/vagrant/multicloud-k8s/kud/hosting_providers/vagrant/ && ./installer.sh | tee kud_installer.log
       SHELL
     end
   end
diff --git a/vagrant/aio.sh b/kud/hosting_providers/vagrant/aio.sh
index 413e4672..31663af5 100755
--- a/vagrant/aio.sh
+++ b/kud/hosting_providers/vagrant/aio.sh
@@ -17,9 +17,9 @@ if [[ $(whoami) != 'root' ]];then
     exit 1
 fi
 
-echo "Cloning and configuring KRD project..."
+echo "Cloning and configuring KUD project..."
 git clone https://git.onap.org/multicloud/k8s/
-cd k8s/vagrant/
+cd k8s/kud/hosting_providers/baremetal/
 cat <<EOL > inventory/hosts.ini
 [all]
 localhost
@@ -46,7 +46,7 @@ localhost
 kube-node
 kube-master
 EOL
-sed -i '/andrewrothstein.kubectl/d' playbooks/configure-*.yml
+sed -i '/andrewrothstein.kubectl/d' ../../deployment_infra/playbooks/configure-*.yml
 echo -e "\n\n\n" | ssh-keygen -t rsa -N ""
 cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
 chmod og-wx ~/.ssh/authorized_keys
@@ -55,4 +55,4 @@ echo "Enabling nested-virtualization"
 ./node.sh
 
 echo "Deploying KRD project"
-./installer.sh | tee krd_installer.log
+./installer.sh | tee kud_installer.log
diff --git a/vagrant/config/default.yml b/kud/hosting_providers/vagrant/config/default.yml
index 10b93663..10b93663 100644
--- a/vagrant/config/default.yml
+++ b/kud/hosting_providers/vagrant/config/default.yml
diff --git a/vagrant/config/samples/pdf.yml.aio b/kud/hosting_providers/vagrant/config/samples/pdf.yml.aio
index 48a3c938..48a3c938 100644
--- a/vagrant/config/samples/pdf.yml.aio
+++ b/kud/hosting_providers/vagrant/config/samples/pdf.yml.aio
diff --git a/vagrant/config/samples/pdf.yml.mini b/kud/hosting_providers/vagrant/config/samples/pdf.yml.mini
index d53a4537..d53a4537 100644
--- a/vagrant/config/samples/pdf.yml.mini
+++ b/kud/hosting_providers/vagrant/config/samples/pdf.yml.mini
diff --git a/vagrant/insecure_keys/key b/kud/hosting_providers/vagrant/insecure_keys/key
index 7d6a0839..7d6a0839 100644
--- a/vagrant/insecure_keys/key
+++ b/kud/hosting_providers/vagrant/insecure_keys/key
diff --git a/vagrant/insecure_keys/key.pub b/kud/hosting_providers/vagrant/insecure_keys/key.pub
index 18a9c00f..18a9c00f 100644
--- a/vagrant/insecure_keys/key.pub
+++ b/kud/hosting_providers/vagrant/insecure_keys/key.pub
diff --git a/vagrant/installer b/kud/hosting_providers/vagrant/installer
index 2b6cb163..2b6cb163 120000
--- a/vagrant/installer
+++ b/kud/hosting_providers/vagrant/installer
diff --git a/vagrant/installer.sh b/kud/hosting_providers/vagrant/installer.sh
index 6f0c3052..3f3595b1 100755
--- a/vagrant/installer.sh
+++ b/kud/hosting_providers/vagrant/installer.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# SPDX-license-identifier: Apache-2.0
+#SPDX-license-identifier: Apache-2.0
 ##############################################################################
 # Copyright (c) 2018
 # All rights reserved. This program and the accompanying materials
@@ -13,7 +13,7 @@ set -o pipefail
 
 # _install_go() - Install GoLang package
 function _install_go {
-    version=$(grep "go_version" ${krd_playbooks}/krd-vars.yml | awk -F "'" '{print $2}')
+    version=$(grep "go_version" ${kud_playbooks}/kud-vars.yml | awk -F "'" '{print $2}')
     local tarball=go$version.linux-amd64.tar.gz
 
     if $(go version &>/dev/null); then
@@ -86,7 +86,7 @@ function _install_docker {
 }
 
 function _set_environment_file {
-    ansible_ifconfig=$(ansible ovn-central[0] -i $krd_inventory -m shell -a "ifconfig eth1 |grep \"inet addr\" |awk '{print \$2}' |awk -F: '{print \$2}'")
+    ansible_ifconfig=$(ansible ovn-central[0] -i $kud_inventory -m shell -a "ifconfig eth1 |grep \"inet addr\" |awk '{print \$2}' |awk -F: '{print \$2}'")
     if [[ $ansible_ifconfig != *CHANGED* ]]; then
         echo "Fail to get the OVN central IP address from eth1 nic"
         exit
@@ -99,10 +99,9 @@ function _set_environment_file {
 function install_k8s {
     echo "Deploying kubernetes"
     local dest_folder=/opt
-    version=$(grep "kubespray_version" ${krd_playbooks}/krd-vars.yml | awk -F ': ' '{print $2}')
-    local_release_dir=$(grep "local_release_dir" $krd_inventory_folder/group_vars/k8s-cluster.yml | awk -F "\"" '{print $2}')
+    version=$(grep "kubespray_version" ${kud_playbooks}/kud-vars.yml | awk -F ': ' '{print $2}')
+    local_release_dir=$(grep "local_release_dir" $kud_inventory_folder/group_vars/k8s-cluster.yml | awk -F "\"" '{print $2}')
     local tarball=v$version.tar.gz
-
     sudo apt-get install -y sshpass
     _install_docker
     _install_ansible
@@ -114,38 +113,38 @@ function install_k8s {
     rm $tarball
 
     sudo -E pip install -r $dest_folder/kubespray-$version/requirements.txt
-    rm -f $krd_inventory_folder/group_vars/all.yml 2> /dev/null
+    rm -f $kud_inventory_folder/group_vars/all.yml 2> /dev/null
     if [[ -n "${verbose}" ]]; then
-        echo "kube_log_level: 5" | tee $krd_inventory_folder/group_vars/all.yml
+        echo "kube_log_level: 5" | tee $kud_inventory_folder/group_vars/all.yml
     else
-        echo "kube_log_level: 2" | tee $krd_inventory_folder/group_vars/all.yml
+        echo "kube_log_level: 2" | tee $kud_inventory_folder/group_vars/all.yml
     fi
-    echo "kubeadm_enabled: true" | tee --append $krd_inventory_folder/group_vars/all.yml
+    echo "kubeadm_enabled: true" | tee --append $kud_inventory_folder/group_vars/all.yml
     if [[ -n "${http_proxy}" ]]; then
-        echo "http_proxy: \"$http_proxy\"" | tee --append $krd_inventory_folder/group_vars/all.yml
+        echo "http_proxy: \"$http_proxy\"" | tee --append $kud_inventory_folder/group_vars/all.yml
     fi
     if [[ -n "${https_proxy}" ]]; then
-        echo "https_proxy: \"$https_proxy\"" | tee --append $krd_inventory_folder/group_vars/all.yml
+        echo "https_proxy: \"$https_proxy\"" | tee --append $kud_inventory_folder/group_vars/all.yml
     fi
-    ansible-playbook $verbose -i $krd_inventory $dest_folder/kubespray-$version/cluster.yml --become --become-user=root | sudo tee $log_folder/setup-kubernetes.log
+    ansible-playbook $verbose -i $kud_inventory $dest_folder/kubespray-$version/cluster.yml --become --become-user=root | sudo tee $log_folder/setup-kubernetes.log
 
     # Configure environment
     mkdir -p $HOME/.kube
-    cp $krd_inventory_folder/artifacts/admin.conf $HOME/.kube/config
+    cp $kud_inventory_folder/artifacts/admin.conf $HOME/.kube/config
 }
 
 # install_addons() - Install Kubenertes AddOns
 function install_addons {
     echo "Installing Kubernetes AddOns"
     _install_ansible
-    sudo ansible-galaxy install $verbose -r $krd_folder/galaxy-requirements.yml --ignore-errors
+    sudo ansible-galaxy install $verbose -r $kud_infra_folder/galaxy-requirements.yml --ignore-errors
 
-    ansible-playbook $verbose -i $krd_inventory $krd_playbooks/configure-krd.yml | sudo tee $log_folder/setup-krd.log
+    ansible-playbook $verbose -i $kud_inventory $kud_playbooks/configure-kud.yml | sudo tee $log_folder/setup-kud.log
     for addon in ${KRD_ADDONS:-virtlet ovn4nfv}; do
         echo "Deploying $addon using configure-$addon.yml playbook.."
-        ansible-playbook $verbose -i $krd_inventory $krd_playbooks/configure-${addon}.yml | sudo tee $log_folder/setup-${addon}.log
+        ansible-playbook $verbose -i $kud_inventory $kud_playbooks/configure-${addon}.yml | sudo tee $log_folder/setup-${addon}.log
         if [[ "${testing_enabled}" == "true" ]]; then
-            pushd $krd_tests
+            pushd $kud_tests
             bash ${addon}.sh
             popd
         fi
@@ -160,15 +159,15 @@ function install_plugin {
     sudo -E pip install docker-compose
 
     sudo mkdir -p /opt/{kubeconfig,consul/config}
-    sudo cp $HOME/.kube/config /opt/kubeconfig/krd
+    sudo cp $HOME/.kube/config /opt/kubeconfig/kud
     _set_environment_file
     source /etc/environment
 
-    pushd $krd_folder/../deployments
+    pushd $kud_folder/../../../deployments
     sudo ./build.sh
     if [[ "${testing_enabled}" == "true" ]]; then
         docker-compose up -d
-        pushd $krd_tests
+        pushd $kud_tests
         for functional_test in plugin plugin_edgex; do
             bash ${functional_test}.sh
         done
@@ -205,20 +204,21 @@ if ! sudo -n "true"; then
     exit 1
 fi
 
-if [[ -n "${KRD_DEBUG}" ]]; then
+if [[ -n "${KUD_DEBUG}" ]]; then
     set -o xtrace
     verbose="-vvv"
 fi
 
 # Configuration values
-log_folder=/var/log/krd
-krd_folder=$(pwd)
-export krd_inventory_folder=$krd_folder/inventory
-krd_inventory=$krd_inventory_folder/hosts.ini
-krd_playbooks=$krd_folder/playbooks
-krd_tests=$krd_folder/tests
-k8s_info_file=$krd_folder/k8s_info.log
-testing_enabled=${KRD_ENABLE_TESTS:-false}
+log_folder=/var/log/kud
+kud_folder=$(pwd)
+kud_infra_folder=$kud_folder/../../deployment_infra
+export kud_inventory_folder=$kud_folder/inventory
+kud_inventory=$kud_inventory_folder/hosts.ini
+kud_playbooks=$kud_infra_folder/playbooks
+kud_tests=$kud_folder/tests
+k8s_info_file=$kud_folder/k8s_info.log
+testing_enabled=${KUD_ENABLE_TESTS:-false}
 
 sudo mkdir -p $log_folder
 sudo mkdir -p /opt/csar
@@ -227,14 +227,14 @@ echo "export CSAR_DIR=/opt/csar" | sudo tee --append /etc/environment
 
 # Install dependencies
 # Setup proxy variables
-if [ -f $krd_folder/sources.list ]; then
+if [ -f $kud_folder/sources.list ]; then
     sudo mv /etc/apt/sources.list /etc/apt/sources.list.backup
-    sudo cp $krd_folder/sources.list /etc/apt/sources.list
+    sudo cp $kud_folder/sources.list /etc/apt/sources.list
 fi
 sudo apt-get update
 install_k8s
 install_addons
-if [[ "${KRD_PLUGIN_ENABLED:-false}" ]]; then
+if [[ "${KUD_PLUGIN_ENABLED:-false}" ]]; then
     install_plugin
 fi
 _print_kubernetes_info
diff --git a/vagrant/inventory/group_vars/k8s-cluster.yml b/kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml
index 8f719a43..8f719a43 100644
--- a/vagrant/inventory/group_vars/k8s-cluster.yml
+++ b/kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml
diff --git a/vagrant/node.sh b/kud/hosting_providers/vagrant/node.sh
index a51be19b..a51be19b 100755
--- a/vagrant/node.sh
+++ b/kud/hosting_providers/vagrant/node.sh
diff --git a/vagrant/setup.sh b/kud/hosting_providers/vagrant/setup.sh
index 9c65ccdb..9c65ccdb 100755
--- a/vagrant/setup.sh
+++ b/kud/hosting_providers/vagrant/setup.sh
diff --git a/vagrant/tests/_common.sh b/kud/tests/_common.sh
index f0fa7d6f..f0fa7d6f 100755
--- a/vagrant/tests/_common.sh
+++ b/kud/tests/_common.sh
diff --git a/vagrant/tests/_functions.sh b/kud/tests/_functions.sh
index 62feb7b7..c25d1f2f 100755
--- a/vagrant/tests/_functions.sh
+++ b/kud/tests/_functions.sh
@@ -21,7 +21,7 @@ function print_msg {
 }
 
 function _get_ovn_central_address {
-    ansible_ifconfig=$(ansible ovn-central[0] -i $test_folder/../inventory/hosts.ini -m shell -a "ifconfig eth1 |grep \"inet addr\" |awk '{print \$2}' |awk -F: '{print \$2}'")
+    ansible_ifconfig=$(ansible ovn-central[0] -i $test_folder/../hosting_providers/vagrant/inventory/hosts.ini -m shell -a "ifconfig eth1 |grep \"inet addr\" |awk '{print \$2}' |awk -F: '{print \$2}'")
     if [[ $ansible_ifconfig != *CHANGED* ]]; then
         echo "Fail to get the OVN central IP address from eth1 nic"
         exit
diff --git a/vagrant/tests/cFW/README.md b/kud/tests/cFW/README.md
index c6ac9e20..c6ac9e20 100644
--- a/vagrant/tests/cFW/README.md
+++ b/kud/tests/cFW/README.md
diff --git a/vagrant/tests/cFW/Vagrantfile b/kud/tests/cFW/Vagrantfile
index d02e7d01..d02e7d01 100644
--- a/vagrant/tests/cFW/Vagrantfile
+++ b/kud/tests/cFW/Vagrantfile
diff --git a/vagrant/tests/cFW/darkstat/Dockerfile b/kud/tests/cFW/darkstat/Dockerfile
index d3a46b9c..d3a46b9c 100644
--- a/vagrant/tests/cFW/darkstat/Dockerfile
+++ b/kud/tests/cFW/darkstat/Dockerfile
diff --git a/vagrant/tests/cFW/docker-compose.yml b/kud/tests/cFW/docker-compose.yml
index 6d883fbd..6d883fbd 100644
--- a/vagrant/tests/cFW/docker-compose.yml
+++ b/kud/tests/cFW/docker-compose.yml
diff --git a/vagrant/tests/cFW/firewall/Dockerfile b/kud/tests/cFW/firewall/Dockerfile
index 7d3e6ede..7d3e6ede 100644
--- a/vagrant/tests/cFW/firewall/Dockerfile
+++ b/kud/tests/cFW/firewall/Dockerfile
diff --git a/vagrant/tests/cFW/packetgen/Dockerfile b/kud/tests/cFW/packetgen/Dockerfile
index cb1da555..cb1da555 100644
--- a/vagrant/tests/cFW/packetgen/Dockerfile
+++ b/kud/tests/cFW/packetgen/Dockerfile
diff --git a/vagrant/tests/cFW/postinstall.sh b/kud/tests/cFW/postinstall.sh
index 5a1d5043..5a1d5043 100755
--- a/vagrant/tests/cFW/postinstall.sh
+++ b/kud/tests/cFW/postinstall.sh
diff --git a/vagrant/tests/cFW/sink/Dockerfile b/kud/tests/cFW/sink/Dockerfile
index 6b43ba61..6b43ba61 100644
--- a/vagrant/tests/cFW/sink/Dockerfile
+++ b/kud/tests/cFW/sink/Dockerfile
diff --git a/vagrant/tests/cFW/vpp/80-vpp.conf b/kud/tests/cFW/vpp/80-vpp.conf
index 8fdf184c..8fdf184c 100644
--- a/vagrant/tests/cFW/vpp/80-vpp.conf
+++ b/kud/tests/cFW/vpp/80-vpp.conf
diff --git a/vagrant/tests/cFW/vpp/Dockerfile b/kud/tests/cFW/vpp/Dockerfile
index 63b08b01..63b08b01 100644
--- a/vagrant/tests/cFW/vpp/Dockerfile
+++ b/kud/tests/cFW/vpp/Dockerfile
diff --git a/vagrant/tests/generic_simulator/Dockerfile b/kud/tests/generic_simulator/Dockerfile
index 202cafc6..202cafc6 100644
--- a/vagrant/tests/generic_simulator/Dockerfile
+++ b/kud/tests/generic_simulator/Dockerfile
diff --git a/vagrant/tests/generic_simulator/aai/responses.yml b/kud/tests/generic_simulator/aai/responses.yml
index 041e5207..041e5207 100644
--- a/vagrant/tests/generic_simulator/aai/responses.yml
+++ b/kud/tests/generic_simulator/aai/responses.yml
diff --git a/vagrant/tests/generic_simulator/generic_sim.py b/kud/tests/generic_simulator/generic_sim.py
index 4392b652..4392b652 100644
--- a/vagrant/tests/generic_simulator/generic_sim.py
+++ b/kud/tests/generic_simulator/generic_sim.py
diff --git a/vagrant/tests/generic_simulator/requirements.txt b/kud/tests/generic_simulator/requirements.txt
index a0b6aae2..a0b6aae2 100644
--- a/vagrant/tests/generic_simulator/requirements.txt
+++ b/kud/tests/generic_simulator/requirements.txt
diff --git a/vagrant/tests/integration_cFW.sh b/kud/tests/integration_cFW.sh
index 92c280b9..92c280b9 100755
--- a/vagrant/tests/integration_cFW.sh
+++ b/kud/tests/integration_cFW.sh
diff --git a/vagrant/tests/integration_vFW.sh b/kud/tests/integration_vFW.sh
index 78a6b10c..78a6b10c 100755
--- a/vagrant/tests/integration_vFW.sh
+++ b/kud/tests/integration_vFW.sh
diff --git a/vagrant/tests/integration_vcFW.sh b/kud/tests/integration_vcFW.sh
index ccda1190..ccda1190 100755
--- a/vagrant/tests/integration_vcFW.sh
+++ b/kud/tests/integration_vcFW.sh
diff --git a/vagrant/tests/istio.sh b/kud/tests/istio.sh
index 79ef4ac8..c525bb8e 100755
--- a/vagrant/tests/istio.sh
+++ b/kud/tests/istio.sh
@@ -16,9 +16,9 @@ source _functions.sh
 
 csar_id=ac39959e-e82c-11e8-9133-525400912638
 
-base_dest=$(grep "base_dest:" $test_folder/../playbooks/krd-vars.yml | awk -F ': ' '{print $2}')
-istio_dest=$(grep "istio_dest:" $test_folder/../playbooks/krd-vars.yml | awk -F ': ' '{print $2}' | sed "s|{{ base_dest }}|$base_dest|g;s|\"||g")
-istio_version=$(grep "istio_version:" $test_folder/../playbooks/krd-vars.yml | awk -F ': ' '{print $2}')
+base_dest=$(grep "base_dest:" $test_folder/../deployment_infra/playbooks/kud-vars.yml | awk -F ': ' '{print $2}')
+istio_dest=$(grep "istio_dest:" $test_folder/../deployment_infra/playbooks/kud-vars.yml | awk -F ': ' '{print $2}' | sed "s|{{ base_dest }}|$base_dest|g;s|\"||g")
+istio_version=$(grep "istio_version:" $test_folder/../deployment_infra/playbooks/kud-vars.yml | awk -F ': ' '{print $2}')
 
 if ! $(istioctl version &>/dev/null); then
     echo "This funtional test requires istioctl client"
diff --git a/vagrant/tests/multus.sh b/kud/tests/multus.sh
index 859fa3bb..859fa3bb 100755
--- a/vagrant/tests/multus.sh
+++ b/kud/tests/multus.sh
diff --git a/vagrant/tests/nfd.sh b/kud/tests/nfd.sh
index 17548206..17548206 100755
--- a/vagrant/tests/nfd.sh
+++ b/kud/tests/nfd.sh
diff --git a/vagrant/tests/ovn-kubernetes.sh b/kud/tests/ovn-kubernetes.sh
index 95d216bf..95d216bf 100755
--- a/vagrant/tests/ovn-kubernetes.sh
+++ b/kud/tests/ovn-kubernetes.sh
diff --git a/vagrant/tests/ovn4nfv.sh b/kud/tests/ovn4nfv.sh
index 37fddfd8..37fddfd8 100755
--- a/vagrant/tests/ovn4nfv.sh
+++ b/kud/tests/ovn4nfv.sh
diff --git a/vagrant/tests/plugin.sh b/kud/tests/plugin.sh
index b36e75f5..6cf93cef 100755
--- a/vagrant/tests/plugin.sh
+++ b/kud/tests/plugin.sh
@@ -17,7 +17,7 @@ source _common.sh
 source _functions.sh
 
 base_url="http://localhost:8081"
-cloud_region_id="krd"
+cloud_region_id="kud"
 namespace="default"
 csar_id="94e414f6-9ca4-11e8-bb6a-52540067263b"
 rbd_csar_id="7eb09e38-4363-9942-1234-3beb2e95fd85"
diff --git a/vagrant/tests/plugin_edgex.sh b/kud/tests/plugin_edgex.sh
index 575040bb..3165efbf 100755
--- a/vagrant/tests/plugin_edgex.sh
+++ b/kud/tests/plugin_edgex.sh
@@ -16,7 +16,7 @@ set -o pipefail
 source _functions.sh
 
 base_url="http://localhost:8081/v1/vnf_instances/"
-cloud_region_id="krd"
+cloud_region_id="kud"
 namespace="default"
 csar_id=cb009bfe-bbee-11e8-9766-525400435678
 
diff --git a/vagrant/tests/vFW/README.md b/kud/tests/vFW/README.md
index f54a555f..f54a555f 100644
--- a/vagrant/tests/vFW/README.md
+++ b/kud/tests/vFW/README.md
diff --git a/vagrant/tests/vFW/Vagrantfile b/kud/tests/vFW/Vagrantfile
index cabe6504..cabe6504 100644
--- a/vagrant/tests/vFW/Vagrantfile
+++ b/kud/tests/vFW/Vagrantfile
diff --git a/vagrant/tests/vFW/diagram.png b/kud/tests/vFW/diagram.png
index 4cf95f2f..4cf95f2f 100644
--- a/vagrant/tests/vFW/diagram.png
+++ b/kud/tests/vFW/diagram.png
diff --git a/vagrant/tests/vFW/firewall b/kud/tests/vFW/firewall
index 93d4f2a3..93d4f2a3 100755
--- a/vagrant/tests/vFW/firewall
+++ b/kud/tests/vFW/firewall
diff --git a/vagrant/tests/vFW/packetgen b/kud/tests/vFW/packetgen
index 51d5c676..51d5c676 100755
--- a/vagrant/tests/vFW/packetgen
+++ b/kud/tests/vFW/packetgen
diff --git a/vagrant/tests/vFW/sink b/kud/tests/vFW/sink
index 5604198f..5604198f 100755
--- a/vagrant/tests/vFW/sink
+++ b/kud/tests/vFW/sink
diff --git a/vagrant/tests/virtlet.sh b/kud/tests/virtlet.sh
index 04c1276d..04c1276d 100755
--- a/vagrant/tests/virtlet.sh
+++ b/kud/tests/virtlet.sh
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/Chart.yaml b/kud/tests/vnfs/edgex/helm/edgex/Chart.yaml
index d52b1925..d52b1925 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/Chart.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/Chart.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/Chart.yaml b/kud/tests/vnfs/edgex/helm/edgex/charts/consul/Chart.yaml
index 74fa86ca..74fa86ca 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/Chart.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/charts/consul/Chart.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/templates/consul-deployment.yaml b/kud/tests/vnfs/edgex/helm/edgex/charts/consul/templates/consul-deployment.yaml
index 5db9b855..5db9b855 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/templates/consul-deployment.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/charts/consul/templates/consul-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/templates/consul-service.yaml b/kud/tests/vnfs/edgex/helm/edgex/charts/consul/templates/consul-service.yaml
index 783edef8..783edef8 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/templates/consul-service.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/charts/consul/templates/consul-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/values.yaml b/kud/tests/vnfs/edgex/helm/edgex/charts/consul/values.yaml
index bf7732df..bf7732df 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/values.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/charts/consul/values.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/Chart.yaml b/kud/tests/vnfs/edgex/helm/edgex/charts/mongo/Chart.yaml
index 19c4a324..19c4a324 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/Chart.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/charts/mongo/Chart.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/templates/mongo-deployment.yaml b/kud/tests/vnfs/edgex/helm/edgex/charts/mongo/templates/mongo-deployment.yaml
index 3251309e..3251309e 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/templates/mongo-deployment.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/charts/mongo/templates/mongo-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/templates/mongo-service.yaml b/kud/tests/vnfs/edgex/helm/edgex/charts/mongo/templates/mongo-service.yaml
index 5b30a45f..5b30a45f 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/templates/mongo-service.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/charts/mongo/templates/mongo-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/values.yaml b/kud/tests/vnfs/edgex/helm/edgex/charts/mongo/values.yaml
index e22b846a..e22b846a 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/values.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/charts/mongo/values.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/command-deployment.yaml b/kud/tests/vnfs/edgex/helm/edgex/templates/command-deployment.yaml
index 1b43128c..1b43128c 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/command-deployment.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/templates/command-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/command-service.yaml b/kud/tests/vnfs/edgex/helm/edgex/templates/command-service.yaml
index 7ffc7cce..7ffc7cce 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/command-service.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/templates/command-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/data-deployment.yaml b/kud/tests/vnfs/edgex/helm/edgex/templates/data-deployment.yaml
index 81a1e3b9..81a1e3b9 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/data-deployment.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/templates/data-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/data-service.yaml b/kud/tests/vnfs/edgex/helm/edgex/templates/data-service.yaml
index c7f68798..c7f68798 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/data-service.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/templates/data-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/device-bluetooth-deployment.yaml b/kud/tests/vnfs/edgex/helm/edgex/templates/device-bluetooth-deployment.yaml
index 52ab77e8..52ab77e8 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/device-bluetooth-deployment.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/templates/device-bluetooth-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/device-bluetooth-service.yaml b/kud/tests/vnfs/edgex/helm/edgex/templates/device-bluetooth-service.yaml
index dbbb1e39..dbbb1e39 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/device-bluetooth-service.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/templates/device-bluetooth-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/export-client-deployment.yaml b/kud/tests/vnfs/edgex/helm/edgex/templates/export-client-deployment.yaml
index 0d60b419..0d60b419 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/export-client-deployment.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/templates/export-client-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/export-client-service.yaml b/kud/tests/vnfs/edgex/helm/edgex/templates/export-client-service.yaml
index ec44fd51..ec44fd51 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/export-client-service.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/templates/export-client-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/export-distro-deployment.yaml b/kud/tests/vnfs/edgex/helm/edgex/templates/export-distro-deployment.yaml
index 4cf17dfe..4cf17dfe 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/export-distro-deployment.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/templates/export-distro-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/export-distro-service.yaml b/kud/tests/vnfs/edgex/helm/edgex/templates/export-distro-service.yaml
index 70624abf..70624abf 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/export-distro-service.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/templates/export-distro-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/logging-deployment.yaml b/kud/tests/vnfs/edgex/helm/edgex/templates/logging-deployment.yaml
index a60e26f1..a60e26f1 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/logging-deployment.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/templates/logging-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/logging-service.yaml b/kud/tests/vnfs/edgex/helm/edgex/templates/logging-service.yaml
index 32c85908..32c85908 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/logging-service.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/templates/logging-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/metadata-deployment.yaml b/kud/tests/vnfs/edgex/helm/edgex/templates/metadata-deployment.yaml
index 6ce913fa..6ce913fa 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/metadata-deployment.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/templates/metadata-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/metadata-service.yaml b/kud/tests/vnfs/edgex/helm/edgex/templates/metadata-service.yaml
index 8d03118f..8d03118f 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/metadata-service.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/templates/metadata-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/notifications-deployment.yaml b/kud/tests/vnfs/edgex/helm/edgex/templates/notifications-deployment.yaml
index d736d14a..d736d14a 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/notifications-deployment.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/templates/notifications-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/notifications-service.yaml b/kud/tests/vnfs/edgex/helm/edgex/templates/notifications-service.yaml
index d9afefc5..d9afefc5 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/notifications-service.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/templates/notifications-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/pv.yaml b/kud/tests/vnfs/edgex/helm/edgex/templates/pv.yaml
index aa07549d..aa07549d 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/pv.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/templates/pv.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/pvc.yaml b/kud/tests/vnfs/edgex/helm/edgex/templates/pvc.yaml
index 7c31733e..7c31733e 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/pvc.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/templates/pvc.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/rulesengine-deployment.yaml b/kud/tests/vnfs/edgex/helm/edgex/templates/rulesengine-deployment.yaml
index 0f3e1384..0f3e1384 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/rulesengine-deployment.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/templates/rulesengine-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/rulesengine-service.yaml b/kud/tests/vnfs/edgex/helm/edgex/templates/rulesengine-service.yaml
index 756ad423..756ad423 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/rulesengine-service.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/templates/rulesengine-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/scheduler-deployment.yaml b/kud/tests/vnfs/edgex/helm/edgex/templates/scheduler-deployment.yaml
index 1bff0521..1bff0521 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/scheduler-deployment.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/templates/scheduler-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/scheduler-service.yaml b/kud/tests/vnfs/edgex/helm/edgex/templates/scheduler-service.yaml
index a5311829..a5311829 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/scheduler-service.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/templates/scheduler-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/values.yaml b/kud/tests/vnfs/edgex/helm/edgex/values.yaml
index 90a0068d..90a0068d 100644
--- a/vagrant/tests/vnfs/edgex/helm/edgex/values.yaml
+++ b/kud/tests/vnfs/edgex/helm/edgex/values.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/command-deployment.yaml b/kud/tests/vnfs/edgex/kubernetes/deployments/command-deployment.yaml
index ba4e3c12..ba4e3c12 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/command-deployment.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/deployments/command-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/consul-deployment.yaml b/kud/tests/vnfs/edgex/kubernetes/deployments/consul-deployment.yaml
index 157a2130..157a2130 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/consul-deployment.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/deployments/consul-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/data-deployment.yaml b/kud/tests/vnfs/edgex/kubernetes/deployments/data-deployment.yaml
index 64d28a4c..64d28a4c 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/data-deployment.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/deployments/data-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/device-bluetooth-deployment.yaml b/kud/tests/vnfs/edgex/kubernetes/deployments/device-bluetooth-deployment.yaml
index 9dc96785..9dc96785 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/device-bluetooth-deployment.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/deployments/device-bluetooth-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/export-client-deployment.yaml b/kud/tests/vnfs/edgex/kubernetes/deployments/export-client-deployment.yaml
index 191abc4f..191abc4f 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/export-client-deployment.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/deployments/export-client-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/export-distro-deployment.yaml b/kud/tests/vnfs/edgex/kubernetes/deployments/export-distro-deployment.yaml
index ff0d880e..ff0d880e 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/export-distro-deployment.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/deployments/export-distro-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/logging-deployment.yaml b/kud/tests/vnfs/edgex/kubernetes/deployments/logging-deployment.yaml
index a52085bc..a52085bc 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/logging-deployment.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/deployments/logging-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/metadata-deployment.yaml b/kud/tests/vnfs/edgex/kubernetes/deployments/metadata-deployment.yaml
index 44eb8114..44eb8114 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/metadata-deployment.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/deployments/metadata-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/mongo-deployment.yaml b/kud/tests/vnfs/edgex/kubernetes/deployments/mongo-deployment.yaml
index 26df5f02..26df5f02 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/mongo-deployment.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/deployments/mongo-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/notifications-deployment.yaml b/kud/tests/vnfs/edgex/kubernetes/deployments/notifications-deployment.yaml
index 447789e3..447789e3 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/notifications-deployment.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/deployments/notifications-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/rulesengine-deployment.yaml b/kud/tests/vnfs/edgex/kubernetes/deployments/rulesengine-deployment.yaml
index 1d49b67a..1d49b67a 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/rulesengine-deployment.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/deployments/rulesengine-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/scheduler-deployment.yaml b/kud/tests/vnfs/edgex/kubernetes/deployments/scheduler-deployment.yaml
index 94e4226b..94e4226b 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/scheduler-deployment.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/deployments/scheduler-deployment.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/metadata.yaml b/kud/tests/vnfs/edgex/kubernetes/metadata.yaml
index 63f784dc..63f784dc 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/metadata.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/metadata.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/command-service.yaml b/kud/tests/vnfs/edgex/kubernetes/services/command-service.yaml
index f8d7d745..f8d7d745 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/command-service.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/services/command-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/consul-service.yaml b/kud/tests/vnfs/edgex/kubernetes/services/consul-service.yaml
index 7b5c6ddc..7b5c6ddc 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/consul-service.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/services/consul-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/data-service.yaml b/kud/tests/vnfs/edgex/kubernetes/services/data-service.yaml
index fc6e5566..fc6e5566 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/data-service.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/services/data-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/device-bluetooth-service.yaml b/kud/tests/vnfs/edgex/kubernetes/services/device-bluetooth-service.yaml
index 48ffc9ef..48ffc9ef 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/device-bluetooth-service.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/services/device-bluetooth-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/export-client-service.yaml b/kud/tests/vnfs/edgex/kubernetes/services/export-client-service.yaml
index 709953cd..709953cd 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/export-client-service.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/services/export-client-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/export-distro-service.yaml b/kud/tests/vnfs/edgex/kubernetes/services/export-distro-service.yaml
index 19d6bf5e..19d6bf5e 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/export-distro-service.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/services/export-distro-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/logging-service.yaml b/kud/tests/vnfs/edgex/kubernetes/services/logging-service.yaml
index a25d9a9e..a25d9a9e 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/logging-service.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/services/logging-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/metadata-service.yaml b/kud/tests/vnfs/edgex/kubernetes/services/metadata-service.yaml
index 12f76836..12f76836 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/metadata-service.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/services/metadata-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/mongo-service.yaml b/kud/tests/vnfs/edgex/kubernetes/services/mongo-service.yaml
index 0c919b79..0c919b79 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/mongo-service.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/services/mongo-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/notifications-service.yaml b/kud/tests/vnfs/edgex/kubernetes/services/notifications-service.yaml
index 3245282b..3245282b 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/notifications-service.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/services/notifications-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/rulesengine-service.yaml b/kud/tests/vnfs/edgex/kubernetes/services/rulesengine-service.yaml
index 238c32ce..238c32ce 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/rulesengine-service.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/services/rulesengine-service.yaml
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/scheduler-service.yaml b/kud/tests/vnfs/edgex/kubernetes/services/scheduler-service.yaml
index 03ac0818..03ac0818 100644
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/scheduler-service.yaml
+++ b/kud/tests/vnfs/edgex/kubernetes/services/scheduler-service.yaml
diff --git a/vagrant/tests/vnfs/testrb/helm/profile/manifest.yaml b/kud/tests/vnfs/testrb/helm/profile/manifest.yaml
index ef260633..ef260633 100644
--- a/vagrant/tests/vnfs/testrb/helm/profile/manifest.yaml
+++ b/kud/tests/vnfs/testrb/helm/profile/manifest.yaml
diff --git a/vagrant/tests/vnfs/testrb/helm/profile/override_values.yaml b/kud/tests/vnfs/testrb/helm/profile/override_values.yaml
index c9f29a31..c9f29a31 100644
--- a/vagrant/tests/vnfs/testrb/helm/profile/override_values.yaml
+++ b/kud/tests/vnfs/testrb/helm/profile/override_values.yaml
diff --git a/vagrant/tests/vnfs/testrb/helm/profile/testfol/subdir/deployment.yaml b/kud/tests/vnfs/testrb/helm/profile/testfol/subdir/deployment.yaml
index 938e1843..938e1843 100644
--- a/vagrant/tests/vnfs/testrb/helm/profile/testfol/subdir/deployment.yaml
+++ b/kud/tests/vnfs/testrb/helm/profile/testfol/subdir/deployment.yaml
diff --git a/vagrant/tests/vnfs/testrb/helm/vault-consul-dev/Chart.yaml b/kud/tests/vnfs/testrb/helm/vault-consul-dev/Chart.yaml
index 86643c9d..86643c9d 100644
--- a/vagrant/tests/vnfs/testrb/helm/vault-consul-dev/Chart.yaml
+++ b/kud/tests/vnfs/testrb/helm/vault-consul-dev/Chart.yaml
diff --git a/vagrant/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/Chart.yaml b/kud/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/Chart.yaml
index 7d58e53d..7d58e53d 100644
--- a/vagrant/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/Chart.yaml
+++ b/kud/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/Chart.yaml
diff --git a/vagrant/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_name.tpl b/kud/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_name.tpl
index 42999846..42999846 100644
--- a/vagrant/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_name.tpl
+++ b/kud/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_name.tpl
diff --git a/vagrant/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_namespace.tpl b/kud/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_namespace.tpl
index 94c9ee72..94c9ee72 100644
--- a/vagrant/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_namespace.tpl
+++ b/kud/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_namespace.tpl
diff --git a/vagrant/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_repository.tpl b/kud/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_repository.tpl
index 364ba7dc..364ba7dc 100644
--- a/vagrant/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_repository.tpl
+++ b/kud/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_repository.tpl
diff --git a/vagrant/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_service.tpl b/kud/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_service.tpl
index 77b77d05..77b77d05 100644
--- a/vagrant/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_service.tpl
+++ b/kud/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_service.tpl
diff --git a/vagrant/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/values.yaml b/kud/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/values.yaml
index f7098ee8..f7098ee8 100644
--- a/vagrant/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/values.yaml
+++ b/kud/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/values.yaml
diff --git a/vagrant/tests/vnfs/testrb/helm/vault-consul-dev/templates/deployment.yaml b/kud/tests/vnfs/testrb/helm/vault-consul-dev/templates/deployment.yaml
index 66b2e747..66b2e747 100644
--- a/vagrant/tests/vnfs/testrb/helm/vault-consul-dev/templates/deployment.yaml
+++ b/kud/tests/vnfs/testrb/helm/vault-consul-dev/templates/deployment.yaml
diff --git a/vagrant/tests/vnfs/testrb/helm/vault-consul-dev/templates/service.yaml b/kud/tests/vnfs/testrb/helm/vault-consul-dev/templates/service.yaml
index 04e9a5a9..04e9a5a9 100644
--- a/vagrant/tests/vnfs/testrb/helm/vault-consul-dev/templates/service.yaml
+++ b/kud/tests/vnfs/testrb/helm/vault-consul-dev/templates/service.yaml
diff --git a/vagrant/tests/vnfs/testrb/helm/vault-consul-dev/values.yaml b/kud/tests/vnfs/testrb/helm/vault-consul-dev/values.yaml
index 87c64026..87c64026 100644
--- a/vagrant/tests/vnfs/testrb/helm/vault-consul-dev/values.yaml
+++ b/kud/tests/vnfs/testrb/helm/vault-consul-dev/values.yaml