From 1fd5b3964a142be6c176dcc886d79a614c04ce70 Mon Sep 17 00:00:00 2001 From: Akhila Kishore Date: Wed, 6 Mar 2019 06:34:09 -0800 Subject: [PATCH] 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 --- .gitignore | 10 ++-- {vagrant => kud}/README.md | 37 ++++-------- .../deployment_infra}/galaxy-requirements.yml | 0 .../deployment_infra}/playbooks/Debian.yml | 0 .../deployment_infra}/playbooks/RedHat.yml | 0 .../deployment_infra}/playbooks/Suse.yml | 0 .../playbooks/configure-istio.yml | 4 +- .../deployment_infra/playbooks/configure-kud.yml | 2 +- .../playbooks/configure-multus.yml | 8 +-- .../deployment_infra}/playbooks/configure-nfd.yml | 8 +-- .../playbooks/configure-ovn-kubernetes.yml | 8 +-- .../deployment_infra}/playbooks/configure-ovn.yml | 0 .../playbooks/configure-ovn4nfv.yml | 8 +-- .../playbooks/configure-virtlet.yml | 8 +-- .../deployment_infra/playbooks/kud-vars.yml | 0 kud/hosting_providers/baremetal/README.md | 22 +++++++ kud/hosting_providers/vagrant/README.md | 36 +++++++++++ .../hosting_providers/vagrant}/Vagrantfile | 6 +- {vagrant => kud/hosting_providers/vagrant}/aio.sh | 8 +-- .../hosting_providers/vagrant}/config/default.yml | 0 .../vagrant}/config/samples/pdf.yml.aio | 0 .../vagrant}/config/samples/pdf.yml.mini | 0 .../hosting_providers/vagrant}/insecure_keys/key | 0 .../vagrant}/insecure_keys/key.pub | 0 .../hosting_providers/vagrant}/installer | 0 .../hosting_providers/vagrant}/installer.sh | 66 ++++++++++----------- .../vagrant}/inventory/group_vars/k8s-cluster.yml | 0 {vagrant => kud/hosting_providers/vagrant}/node.sh | 0 .../hosting_providers/vagrant}/setup.sh | 0 {vagrant => kud}/tests/_common.sh | 0 {vagrant => kud}/tests/_functions.sh | 2 +- {vagrant => kud}/tests/cFW/README.md | 0 {vagrant => kud}/tests/cFW/Vagrantfile | 0 {vagrant => kud}/tests/cFW/darkstat/Dockerfile | 0 {vagrant => kud}/tests/cFW/docker-compose.yml | 0 {vagrant => kud}/tests/cFW/firewall/Dockerfile | 0 {vagrant => kud}/tests/cFW/packetgen/Dockerfile | 0 {vagrant => kud}/tests/cFW/postinstall.sh | 0 {vagrant => kud}/tests/cFW/sink/Dockerfile | 0 {vagrant => kud}/tests/cFW/vpp/80-vpp.conf | 0 {vagrant => kud}/tests/cFW/vpp/Dockerfile | 0 .../tests/generic_simulator/Dockerfile | 0 .../tests/generic_simulator/aai/responses.yml | 0 .../tests/generic_simulator/generic_sim.py | 0 .../tests/generic_simulator/requirements.txt | 0 {vagrant => kud}/tests/integration_cFW.sh | 0 {vagrant => kud}/tests/integration_vFW.sh | 0 {vagrant => kud}/tests/integration_vcFW.sh | 0 {vagrant => kud}/tests/istio.sh | 6 +- {vagrant => kud}/tests/multus.sh | 0 {vagrant => kud}/tests/nfd.sh | 0 {vagrant => kud}/tests/ovn-kubernetes.sh | 0 {vagrant => kud}/tests/ovn4nfv.sh | 0 {vagrant => kud}/tests/plugin.sh | 2 +- {vagrant => kud}/tests/plugin_edgex.sh | 2 +- {vagrant => kud}/tests/vFW/README.md | 0 {vagrant => kud}/tests/vFW/Vagrantfile | 0 {vagrant => kud}/tests/vFW/diagram.png | Bin {vagrant => kud}/tests/vFW/firewall | 0 {vagrant => kud}/tests/vFW/packetgen | 0 {vagrant => kud}/tests/vFW/sink | 0 {vagrant => kud}/tests/virtlet.sh | 0 .../tests/vnfs/edgex/helm/edgex/Chart.yaml | 0 .../vnfs/edgex/helm/edgex/charts/consul/Chart.yaml | 0 .../charts/consul/templates/consul-deployment.yaml | 0 .../charts/consul/templates/consul-service.yaml | 0 .../edgex/helm/edgex/charts/consul/values.yaml | 0 .../vnfs/edgex/helm/edgex/charts/mongo/Chart.yaml | 0 .../charts/mongo/templates/mongo-deployment.yaml | 0 .../charts/mongo/templates/mongo-service.yaml | 0 .../vnfs/edgex/helm/edgex/charts/mongo/values.yaml | 0 .../helm/edgex/templates/command-deployment.yaml | 0 .../helm/edgex/templates/command-service.yaml | 0 .../helm/edgex/templates/data-deployment.yaml | 0 .../edgex/helm/edgex/templates/data-service.yaml | 0 .../templates/device-bluetooth-deployment.yaml | 0 .../edgex/templates/device-bluetooth-service.yaml | 0 .../edgex/templates/export-client-deployment.yaml | 0 .../edgex/templates/export-client-service.yaml | 0 .../edgex/templates/export-distro-deployment.yaml | 0 .../edgex/templates/export-distro-service.yaml | 0 .../helm/edgex/templates/logging-deployment.yaml | 0 .../helm/edgex/templates/logging-service.yaml | 0 .../helm/edgex/templates/metadata-deployment.yaml | 0 .../helm/edgex/templates/metadata-service.yaml | 0 .../edgex/templates/notifications-deployment.yaml | 0 .../edgex/templates/notifications-service.yaml | 0 .../tests/vnfs/edgex/helm/edgex/templates/pv.yaml | 0 .../tests/vnfs/edgex/helm/edgex/templates/pvc.yaml | 0 .../edgex/templates/rulesengine-deployment.yaml | 0 .../helm/edgex/templates/rulesengine-service.yaml | 0 .../helm/edgex/templates/scheduler-deployment.yaml | 0 .../helm/edgex/templates/scheduler-service.yaml | 0 .../tests/vnfs/edgex/helm/edgex/values.yaml | 0 .../kubernetes/deployments/command-deployment.yaml | 0 .../kubernetes/deployments/consul-deployment.yaml | 0 .../kubernetes/deployments/data-deployment.yaml | 0 .../deployments/device-bluetooth-deployment.yaml | 0 .../deployments/export-client-deployment.yaml | 0 .../deployments/export-distro-deployment.yaml | 0 .../kubernetes/deployments/logging-deployment.yaml | 0 .../deployments/metadata-deployment.yaml | 0 .../kubernetes/deployments/mongo-deployment.yaml | 0 .../deployments/notifications-deployment.yaml | 0 .../deployments/rulesengine-deployment.yaml | 0 .../deployments/scheduler-deployment.yaml | 0 .../tests/vnfs/edgex/kubernetes/metadata.yaml | 0 .../edgex/kubernetes/services/command-service.yaml | 0 .../edgex/kubernetes/services/consul-service.yaml | 0 .../edgex/kubernetes/services/data-service.yaml | 0 .../services/device-bluetooth-service.yaml | 0 .../kubernetes/services/export-client-service.yaml | 0 .../kubernetes/services/export-distro-service.yaml | 0 .../edgex/kubernetes/services/logging-service.yaml | 0 .../kubernetes/services/metadata-service.yaml | 0 .../edgex/kubernetes/services/mongo-service.yaml | 0 .../kubernetes/services/notifications-service.yaml | 0 .../kubernetes/services/rulesengine-service.yaml | 0 .../kubernetes/services/scheduler-service.yaml | 0 .../tests/vnfs/testrb/helm/profile/manifest.yaml | 0 .../vnfs/testrb/helm/profile/override_values.yaml | 0 .../helm/profile/testfol/subdir/deployment.yaml | 0 .../vnfs/testrb/helm/vault-consul-dev/Chart.yaml | 0 .../helm/vault-consul-dev/charts/common/Chart.yaml | 0 .../charts/common/templates/_name.tpl | 0 .../charts/common/templates/_namespace.tpl | 0 .../charts/common/templates/_repository.tpl | 0 .../charts/common/templates/_service.tpl | 0 .../vault-consul-dev/charts/common/values.yaml | 0 .../vault-consul-dev/templates/deployment.yaml | 0 .../helm/vault-consul-dev/templates/service.yaml | 0 .../vnfs/testrb/helm/vault-consul-dev/values.yaml | 0 132 files changed, 142 insertions(+), 101 deletions(-) rename {vagrant => kud}/README.md (51%) rename {vagrant => kud/deployment_infra}/galaxy-requirements.yml (100%) rename {vagrant => kud/deployment_infra}/playbooks/Debian.yml (100%) rename {vagrant => kud/deployment_infra}/playbooks/RedHat.yml (100%) rename {vagrant => kud/deployment_infra}/playbooks/Suse.yml (100%) rename {vagrant => kud/deployment_infra}/playbooks/configure-istio.yml (97%) rename vagrant/playbooks/configure-krd.yml => kud/deployment_infra/playbooks/configure-kud.yml (90%) rename {vagrant => kud/deployment_infra}/playbooks/configure-multus.yml (96%) rename {vagrant => kud/deployment_infra}/playbooks/configure-nfd.yml (94%) rename {vagrant => kud/deployment_infra}/playbooks/configure-ovn-kubernetes.yml (97%) rename {vagrant => kud/deployment_infra}/playbooks/configure-ovn.yml (100%) rename {vagrant => kud/deployment_infra}/playbooks/configure-ovn4nfv.yml (96%) rename {vagrant => kud/deployment_infra}/playbooks/configure-virtlet.yml (98%) rename vagrant/playbooks/krd-vars.yml => kud/deployment_infra/playbooks/kud-vars.yml (100%) create mode 100644 kud/hosting_providers/baremetal/README.md create mode 100644 kud/hosting_providers/vagrant/README.md rename {vagrant => kud/hosting_providers/vagrant}/Vagrantfile (95%) rename {vagrant => kud/hosting_providers/vagrant}/aio.sh (84%) rename {vagrant => kud/hosting_providers/vagrant}/config/default.yml (100%) rename {vagrant => kud/hosting_providers/vagrant}/config/samples/pdf.yml.aio (100%) rename {vagrant => kud/hosting_providers/vagrant}/config/samples/pdf.yml.mini (100%) rename {vagrant => kud/hosting_providers/vagrant}/insecure_keys/key (100%) rename {vagrant => kud/hosting_providers/vagrant}/insecure_keys/key.pub (100%) rename {vagrant => kud/hosting_providers/vagrant}/installer (100%) rename {vagrant => kud/hosting_providers/vagrant}/installer.sh (80%) rename {vagrant => kud/hosting_providers/vagrant}/inventory/group_vars/k8s-cluster.yml (100%) rename {vagrant => kud/hosting_providers/vagrant}/node.sh (100%) rename {vagrant => kud/hosting_providers/vagrant}/setup.sh (100%) rename {vagrant => kud}/tests/_common.sh (100%) rename {vagrant => kud}/tests/_functions.sh (97%) rename {vagrant => kud}/tests/cFW/README.md (100%) rename {vagrant => kud}/tests/cFW/Vagrantfile (100%) rename {vagrant => kud}/tests/cFW/darkstat/Dockerfile (100%) rename {vagrant => kud}/tests/cFW/docker-compose.yml (100%) rename {vagrant => kud}/tests/cFW/firewall/Dockerfile (100%) rename {vagrant => kud}/tests/cFW/packetgen/Dockerfile (100%) rename {vagrant => kud}/tests/cFW/postinstall.sh (100%) rename {vagrant => kud}/tests/cFW/sink/Dockerfile (100%) rename {vagrant => kud}/tests/cFW/vpp/80-vpp.conf (100%) rename {vagrant => kud}/tests/cFW/vpp/Dockerfile (100%) rename {vagrant => kud}/tests/generic_simulator/Dockerfile (100%) rename {vagrant => kud}/tests/generic_simulator/aai/responses.yml (100%) rename {vagrant => kud}/tests/generic_simulator/generic_sim.py (100%) rename {vagrant => kud}/tests/generic_simulator/requirements.txt (100%) rename {vagrant => kud}/tests/integration_cFW.sh (100%) rename {vagrant => kud}/tests/integration_vFW.sh (100%) rename {vagrant => kud}/tests/integration_vcFW.sh (100%) rename {vagrant => kud}/tests/istio.sh (78%) rename {vagrant => kud}/tests/multus.sh (100%) rename {vagrant => kud}/tests/nfd.sh (100%) rename {vagrant => kud}/tests/ovn-kubernetes.sh (100%) rename {vagrant => kud}/tests/ovn4nfv.sh (100%) rename {vagrant => kud}/tests/plugin.sh (99%) rename {vagrant => kud}/tests/plugin_edgex.sh (98%) rename {vagrant => kud}/tests/vFW/README.md (100%) rename {vagrant => kud}/tests/vFW/Vagrantfile (100%) rename {vagrant => kud}/tests/vFW/diagram.png (100%) rename {vagrant => kud}/tests/vFW/firewall (100%) rename {vagrant => kud}/tests/vFW/packetgen (100%) rename {vagrant => kud}/tests/vFW/sink (100%) rename {vagrant => kud}/tests/virtlet.sh (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/Chart.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/charts/consul/Chart.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/charts/consul/templates/consul-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/charts/consul/templates/consul-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/charts/consul/values.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/charts/mongo/Chart.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/charts/mongo/templates/mongo-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/charts/mongo/templates/mongo-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/charts/mongo/values.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/templates/command-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/templates/command-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/templates/data-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/templates/data-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/templates/device-bluetooth-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/templates/device-bluetooth-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/templates/export-client-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/templates/export-client-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/templates/export-distro-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/templates/export-distro-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/templates/logging-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/templates/logging-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/templates/metadata-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/templates/metadata-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/templates/notifications-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/templates/notifications-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/templates/pv.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/templates/pvc.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/templates/rulesengine-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/templates/rulesengine-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/templates/scheduler-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/templates/scheduler-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/helm/edgex/values.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/deployments/command-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/deployments/consul-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/deployments/data-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/deployments/device-bluetooth-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/deployments/export-client-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/deployments/export-distro-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/deployments/logging-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/deployments/metadata-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/deployments/mongo-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/deployments/notifications-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/deployments/rulesengine-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/deployments/scheduler-deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/metadata.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/services/command-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/services/consul-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/services/data-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/services/device-bluetooth-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/services/export-client-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/services/export-distro-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/services/logging-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/services/metadata-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/services/mongo-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/services/notifications-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/services/rulesengine-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/edgex/kubernetes/services/scheduler-service.yaml (100%) rename {vagrant => kud}/tests/vnfs/testrb/helm/profile/manifest.yaml (100%) rename {vagrant => kud}/tests/vnfs/testrb/helm/profile/override_values.yaml (100%) rename {vagrant => kud}/tests/vnfs/testrb/helm/profile/testfol/subdir/deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/testrb/helm/vault-consul-dev/Chart.yaml (100%) rename {vagrant => kud}/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/Chart.yaml (100%) rename {vagrant => kud}/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_name.tpl (100%) rename {vagrant => kud}/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_namespace.tpl (100%) rename {vagrant => kud}/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_repository.tpl (100%) rename {vagrant => kud}/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_service.tpl (100%) rename {vagrant => kud}/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/values.yaml (100%) rename {vagrant => kud}/tests/vnfs/testrb/helm/vault-consul-dev/templates/deployment.yaml (100%) rename {vagrant => kud}/tests/vnfs/testrb/helm/vault-consul-dev/templates/service.yaml (100%) rename {vagrant => kud}/tests/vnfs/testrb/helm/vault-consul-dev/values.yaml (100%) 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 similarity index 51% rename from vagrant/README.md rename to 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 similarity index 100% rename from vagrant/galaxy-requirements.yml rename to kud/deployment_infra/galaxy-requirements.yml diff --git a/vagrant/playbooks/Debian.yml b/kud/deployment_infra/playbooks/Debian.yml similarity index 100% rename from vagrant/playbooks/Debian.yml rename to kud/deployment_infra/playbooks/Debian.yml diff --git a/vagrant/playbooks/RedHat.yml b/kud/deployment_infra/playbooks/RedHat.yml similarity index 100% rename from vagrant/playbooks/RedHat.yml rename to kud/deployment_infra/playbooks/RedHat.yml diff --git a/vagrant/playbooks/Suse.yml b/kud/deployment_infra/playbooks/Suse.yml similarity index 100% rename from vagrant/playbooks/Suse.yml rename to kud/deployment_infra/playbooks/Suse.yml diff --git a/vagrant/playbooks/configure-istio.yml b/kud/deployment_infra/playbooks/configure-istio.yml similarity index 97% rename from vagrant/playbooks/configure-istio.yml rename to 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 similarity index 90% rename from vagrant/playbooks/configure-krd.yml rename to 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 similarity index 96% rename from vagrant/playbooks/configure-multus.yml rename to 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 similarity index 94% rename from vagrant/playbooks/configure-nfd.yml rename to 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 similarity index 97% rename from vagrant/playbooks/configure-ovn-kubernetes.yml rename to 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 similarity index 100% rename from vagrant/playbooks/configure-ovn.yml rename to kud/deployment_infra/playbooks/configure-ovn.yml diff --git a/vagrant/playbooks/configure-ovn4nfv.yml b/kud/deployment_infra/playbooks/configure-ovn4nfv.yml similarity index 96% rename from vagrant/playbooks/configure-ovn4nfv.yml rename to 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 similarity index 98% rename from vagrant/playbooks/configure-virtlet.yml rename to 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 similarity index 100% rename from vagrant/playbooks/krd-vars.yml rename to 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 similarity index 95% rename from vagrant/Vagrantfile rename to 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 similarity index 84% rename from vagrant/aio.sh rename to 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 < 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 similarity index 100% rename from vagrant/config/default.yml rename to 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 similarity index 100% rename from vagrant/config/samples/pdf.yml.aio rename to 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 similarity index 100% rename from vagrant/config/samples/pdf.yml.mini rename to kud/hosting_providers/vagrant/config/samples/pdf.yml.mini diff --git a/vagrant/insecure_keys/key b/kud/hosting_providers/vagrant/insecure_keys/key similarity index 100% rename from vagrant/insecure_keys/key rename to kud/hosting_providers/vagrant/insecure_keys/key diff --git a/vagrant/insecure_keys/key.pub b/kud/hosting_providers/vagrant/insecure_keys/key.pub similarity index 100% rename from vagrant/insecure_keys/key.pub rename to kud/hosting_providers/vagrant/insecure_keys/key.pub diff --git a/vagrant/installer b/kud/hosting_providers/vagrant/installer similarity index 100% rename from vagrant/installer rename to kud/hosting_providers/vagrant/installer diff --git a/vagrant/installer.sh b/kud/hosting_providers/vagrant/installer.sh similarity index 80% rename from vagrant/installer.sh rename to 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 similarity index 100% rename from vagrant/inventory/group_vars/k8s-cluster.yml rename to kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml diff --git a/vagrant/node.sh b/kud/hosting_providers/vagrant/node.sh similarity index 100% rename from vagrant/node.sh rename to kud/hosting_providers/vagrant/node.sh diff --git a/vagrant/setup.sh b/kud/hosting_providers/vagrant/setup.sh similarity index 100% rename from vagrant/setup.sh rename to kud/hosting_providers/vagrant/setup.sh diff --git a/vagrant/tests/_common.sh b/kud/tests/_common.sh similarity index 100% rename from vagrant/tests/_common.sh rename to kud/tests/_common.sh diff --git a/vagrant/tests/_functions.sh b/kud/tests/_functions.sh similarity index 97% rename from vagrant/tests/_functions.sh rename to 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 similarity index 100% rename from vagrant/tests/cFW/README.md rename to kud/tests/cFW/README.md diff --git a/vagrant/tests/cFW/Vagrantfile b/kud/tests/cFW/Vagrantfile similarity index 100% rename from vagrant/tests/cFW/Vagrantfile rename to kud/tests/cFW/Vagrantfile diff --git a/vagrant/tests/cFW/darkstat/Dockerfile b/kud/tests/cFW/darkstat/Dockerfile similarity index 100% rename from vagrant/tests/cFW/darkstat/Dockerfile rename to kud/tests/cFW/darkstat/Dockerfile diff --git a/vagrant/tests/cFW/docker-compose.yml b/kud/tests/cFW/docker-compose.yml similarity index 100% rename from vagrant/tests/cFW/docker-compose.yml rename to kud/tests/cFW/docker-compose.yml diff --git a/vagrant/tests/cFW/firewall/Dockerfile b/kud/tests/cFW/firewall/Dockerfile similarity index 100% rename from vagrant/tests/cFW/firewall/Dockerfile rename to kud/tests/cFW/firewall/Dockerfile diff --git a/vagrant/tests/cFW/packetgen/Dockerfile b/kud/tests/cFW/packetgen/Dockerfile similarity index 100% rename from vagrant/tests/cFW/packetgen/Dockerfile rename to kud/tests/cFW/packetgen/Dockerfile diff --git a/vagrant/tests/cFW/postinstall.sh b/kud/tests/cFW/postinstall.sh similarity index 100% rename from vagrant/tests/cFW/postinstall.sh rename to kud/tests/cFW/postinstall.sh diff --git a/vagrant/tests/cFW/sink/Dockerfile b/kud/tests/cFW/sink/Dockerfile similarity index 100% rename from vagrant/tests/cFW/sink/Dockerfile rename to kud/tests/cFW/sink/Dockerfile diff --git a/vagrant/tests/cFW/vpp/80-vpp.conf b/kud/tests/cFW/vpp/80-vpp.conf similarity index 100% rename from vagrant/tests/cFW/vpp/80-vpp.conf rename to kud/tests/cFW/vpp/80-vpp.conf diff --git a/vagrant/tests/cFW/vpp/Dockerfile b/kud/tests/cFW/vpp/Dockerfile similarity index 100% rename from vagrant/tests/cFW/vpp/Dockerfile rename to kud/tests/cFW/vpp/Dockerfile diff --git a/vagrant/tests/generic_simulator/Dockerfile b/kud/tests/generic_simulator/Dockerfile similarity index 100% rename from vagrant/tests/generic_simulator/Dockerfile rename to kud/tests/generic_simulator/Dockerfile diff --git a/vagrant/tests/generic_simulator/aai/responses.yml b/kud/tests/generic_simulator/aai/responses.yml similarity index 100% rename from vagrant/tests/generic_simulator/aai/responses.yml rename to 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 similarity index 100% rename from vagrant/tests/generic_simulator/generic_sim.py rename to kud/tests/generic_simulator/generic_sim.py diff --git a/vagrant/tests/generic_simulator/requirements.txt b/kud/tests/generic_simulator/requirements.txt similarity index 100% rename from vagrant/tests/generic_simulator/requirements.txt rename to kud/tests/generic_simulator/requirements.txt diff --git a/vagrant/tests/integration_cFW.sh b/kud/tests/integration_cFW.sh similarity index 100% rename from vagrant/tests/integration_cFW.sh rename to kud/tests/integration_cFW.sh diff --git a/vagrant/tests/integration_vFW.sh b/kud/tests/integration_vFW.sh similarity index 100% rename from vagrant/tests/integration_vFW.sh rename to kud/tests/integration_vFW.sh diff --git a/vagrant/tests/integration_vcFW.sh b/kud/tests/integration_vcFW.sh similarity index 100% rename from vagrant/tests/integration_vcFW.sh rename to kud/tests/integration_vcFW.sh diff --git a/vagrant/tests/istio.sh b/kud/tests/istio.sh similarity index 78% rename from vagrant/tests/istio.sh rename to 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 similarity index 100% rename from vagrant/tests/multus.sh rename to kud/tests/multus.sh diff --git a/vagrant/tests/nfd.sh b/kud/tests/nfd.sh similarity index 100% rename from vagrant/tests/nfd.sh rename to kud/tests/nfd.sh diff --git a/vagrant/tests/ovn-kubernetes.sh b/kud/tests/ovn-kubernetes.sh similarity index 100% rename from vagrant/tests/ovn-kubernetes.sh rename to kud/tests/ovn-kubernetes.sh diff --git a/vagrant/tests/ovn4nfv.sh b/kud/tests/ovn4nfv.sh similarity index 100% rename from vagrant/tests/ovn4nfv.sh rename to kud/tests/ovn4nfv.sh diff --git a/vagrant/tests/plugin.sh b/kud/tests/plugin.sh similarity index 99% rename from vagrant/tests/plugin.sh rename to 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 similarity index 98% rename from vagrant/tests/plugin_edgex.sh rename to 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 similarity index 100% rename from vagrant/tests/vFW/README.md rename to kud/tests/vFW/README.md diff --git a/vagrant/tests/vFW/Vagrantfile b/kud/tests/vFW/Vagrantfile similarity index 100% rename from vagrant/tests/vFW/Vagrantfile rename to kud/tests/vFW/Vagrantfile diff --git a/vagrant/tests/vFW/diagram.png b/kud/tests/vFW/diagram.png similarity index 100% rename from vagrant/tests/vFW/diagram.png rename to kud/tests/vFW/diagram.png diff --git a/vagrant/tests/vFW/firewall b/kud/tests/vFW/firewall similarity index 100% rename from vagrant/tests/vFW/firewall rename to kud/tests/vFW/firewall diff --git a/vagrant/tests/vFW/packetgen b/kud/tests/vFW/packetgen similarity index 100% rename from vagrant/tests/vFW/packetgen rename to kud/tests/vFW/packetgen diff --git a/vagrant/tests/vFW/sink b/kud/tests/vFW/sink similarity index 100% rename from vagrant/tests/vFW/sink rename to kud/tests/vFW/sink diff --git a/vagrant/tests/virtlet.sh b/kud/tests/virtlet.sh similarity index 100% rename from vagrant/tests/virtlet.sh rename to kud/tests/virtlet.sh diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/Chart.yaml b/kud/tests/vnfs/edgex/helm/edgex/Chart.yaml similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/Chart.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/Chart.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/templates/consul-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/templates/consul-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/values.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/Chart.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/templates/mongo-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/templates/mongo-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/values.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/templates/command-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/templates/command-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/templates/data-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/templates/data-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/templates/device-bluetooth-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/templates/device-bluetooth-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/templates/export-client-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/templates/export-client-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/templates/export-distro-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/templates/export-distro-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/templates/logging-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/templates/logging-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/templates/metadata-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/templates/metadata-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/templates/notifications-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/templates/notifications-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/templates/pv.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/templates/pvc.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/templates/rulesengine-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/templates/rulesengine-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/templates/scheduler-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/templates/scheduler-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/helm/edgex/values.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/deployments/command-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/deployments/consul-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/deployments/data-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/deployments/device-bluetooth-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/deployments/export-client-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/deployments/export-distro-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/deployments/logging-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/deployments/metadata-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/deployments/mongo-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/deployments/notifications-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/deployments/rulesengine-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/deployments/scheduler-deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/metadata.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/services/command-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/services/consul-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/services/data-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/services/device-bluetooth-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/services/export-client-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/services/export-distro-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/services/logging-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/services/metadata-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/services/mongo-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/services/notifications-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/services/rulesengine-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/edgex/kubernetes/services/scheduler-service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/testrb/helm/profile/manifest.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/testrb/helm/profile/override_values.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/testrb/helm/profile/testfol/subdir/deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/testrb/helm/vault-consul-dev/Chart.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/Chart.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_name.tpl rename to 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 similarity index 100% rename from vagrant/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_namespace.tpl rename to 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 similarity index 100% rename from vagrant/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_repository.tpl rename to 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 similarity index 100% rename from vagrant/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/templates/_service.tpl rename to 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 similarity index 100% rename from vagrant/tests/vnfs/testrb/helm/vault-consul-dev/charts/common/values.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/testrb/helm/vault-consul-dev/templates/deployment.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/testrb/helm/vault-consul-dev/templates/service.yaml rename to 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 similarity index 100% rename from vagrant/tests/vnfs/testrb/helm/vault-consul-dev/values.yaml rename to kud/tests/vnfs/testrb/helm/vault-consul-dev/values.yaml -- 2.16.6