k8s: Move release-specific files to separate directory

Kubernetes cluster deployment procedure changed with Dublin release
(Rancher to RKE). In order to prepare for further adjustments,
incompatible content will be moved to separate directories.

Once Casablanca becomes obsolete (by the time of El Alto), files
specific to that release will be removed completely.

Issue-ID: SECCOM-235
Change-Id: Iaa0fc2f6ad330ec09dcfdf8a2d27b8a4dc433a0f
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>

diff --git a/test/security/k8s/tools/get_customization_scripts.sh b/test/security/k8s/tools/casablanca/get_customization_scripts.sh
similarity index 100%
rename from test/security/k8s/tools/get_customization_scripts.sh
rename to test/security/k8s/tools/casablanca/get_customization_scripts.sh

diff --git a/test/security/k8s/tools/get_ranchercli.sh b/test/security/k8s/tools/casablanca/get_ranchercli.sh
similarity index 100%
rename from test/security/k8s/tools/get_ranchercli.sh
rename to test/security/k8s/tools/casablanca/get_ranchercli.sh

diff --git a/test/security/k8s/tools/imported/openstack-k8s-node.sh b/test/security/k8s/tools/casablanca/imported/openstack-k8s-node.sh
similarity index 100%
rename from test/security/k8s/tools/imported/openstack-k8s-node.sh
rename to test/security/k8s/tools/casablanca/imported/openstack-k8s-node.sh

diff --git a/test/security/k8s/tools/imported/openstack-rancher.sh b/test/security/k8s/tools/casablanca/imported/openstack-rancher.sh
similarity index 100%
rename from test/security/k8s/tools/imported/openstack-rancher.sh
rename to test/security/k8s/tools/casablanca/imported/openstack-rancher.sh

diff --git a/test/security/k8s/vagrant/Vagrantfile b/test/security/k8s/vagrant/casablanca/Vagrantfile
similarity index 75%
rename from test/security/k8s/vagrant/Vagrantfile
rename to test/security/k8s/vagrant/casablanca/Vagrantfile
index b784862..bed8f3e 100644 (file)
--- a/test/security/k8s/vagrant/Vagrantfile
+++ b/test/security/k8s/vagrant/casablanca/Vagrantfile
@@ -30,12 +30,12 @@ Vagrant.configure('2') do |config|
 
       if node[:name] == 'master'
         config.vm.network "forwarded_port", guest: 8080, host: 8080
-        config.vm.provision :shell, path: "../tools/imported/openstack-rancher.sh"
-        config.vm.provision :shell, path: "../tools/get_ranchercli.sh"
+        config.vm.provision :shell, path: "../../tools/casablanca/imported/openstack-rancher.sh"
+        config.vm.provision :shell, path: "../../tools/casablanca/get_ranchercli.sh"
       end
 
       if node[:name] == 'worker'
-        config.vm.provision :shell, path: "../tools/imported/openstack-k8s-node.sh"
+        config.vm.provision :shell, path: "../../tools/casablanca/imported/openstack-k8s-node.sh"
       end
     end
   end