From 6bbff98bfe55838448a03ec52c25c06feec2e8db Mon Sep 17 00:00:00 2001 From: Pawel Wieczorek Date: Sun, 14 Jul 2019 17:04:53 +0200 Subject: 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 --- test/security/k8s/vagrant/Vagrantfile | 42 ------------------------ test/security/k8s/vagrant/casablanca/Vagrantfile | 42 ++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 test/security/k8s/vagrant/Vagrantfile create mode 100644 test/security/k8s/vagrant/casablanca/Vagrantfile (limited to 'test/security/k8s/vagrant') diff --git a/test/security/k8s/vagrant/Vagrantfile b/test/security/k8s/vagrant/Vagrantfile deleted file mode 100644 index b7848620a..000000000 --- a/test/security/k8s/vagrant/Vagrantfile +++ /dev/null @@ -1,42 +0,0 @@ -# -*- mode: ruby -*- -# -*- coding: utf-8 -*- - -vm_memory = 2 * 1024 -vm_cpus = 1 - -cluster = [ - { name: 'master', hostname: 'master', ip: '172.17.0.100' }, - { name: 'worker', hostname: 'worker', ip: '172.17.0.101' } -] - -Vagrant.configure('2') do |config| - cluster.each do |node| - config.vm.define node[:name] do |config| - config.vm.box = "generic/ubuntu1604" - config.vm.hostname = node[:hostname] - - config.vm.provider :virtualbox do |v| - v.name = node[:name] - v.memory = vm_memory - v.cpus = vm_cpus - end - - config.vm.provider :libvirt do |v| - v.memory = vm_memory - v.cpus = vm_cpus - end - - config.vm.network :private_network, ip: node[:ip] - - 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" - end - - if node[:name] == 'worker' - config.vm.provision :shell, path: "../tools/imported/openstack-k8s-node.sh" - end - end - end -end diff --git a/test/security/k8s/vagrant/casablanca/Vagrantfile b/test/security/k8s/vagrant/casablanca/Vagrantfile new file mode 100644 index 000000000..bed8f3e9c --- /dev/null +++ b/test/security/k8s/vagrant/casablanca/Vagrantfile @@ -0,0 +1,42 @@ +# -*- mode: ruby -*- +# -*- coding: utf-8 -*- + +vm_memory = 2 * 1024 +vm_cpus = 1 + +cluster = [ + { name: 'master', hostname: 'master', ip: '172.17.0.100' }, + { name: 'worker', hostname: 'worker', ip: '172.17.0.101' } +] + +Vagrant.configure('2') do |config| + cluster.each do |node| + config.vm.define node[:name] do |config| + config.vm.box = "generic/ubuntu1604" + config.vm.hostname = node[:hostname] + + config.vm.provider :virtualbox do |v| + v.name = node[:name] + v.memory = vm_memory + v.cpus = vm_cpus + end + + config.vm.provider :libvirt do |v| + v.memory = vm_memory + v.cpus = vm_cpus + end + + config.vm.network :private_network, ip: node[:ip] + + if node[:name] == 'master' + config.vm.network "forwarded_port", guest: 8080, host: 8080 + 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/casablanca/imported/openstack-k8s-node.sh" + end + end + end +end -- cgit 1.2.3-korg