From 155417479ebc5c531349dd898b96ef4a819b0f0a Mon Sep 17 00:00:00 2001
From: Pawel Wieczorek
Date: Mon, 30 Sep 2019 14:23:30 +0200
Subject: k8s: Resolve address conflicts in virtual environments
Running Casablanca and Dublin virtual environments at the same time led
to networking issues - the same IP had been assigned to cluster nodes.
Issue-ID: SECCOM-235
Change-Id: I2a59d023115326f5b132782a32190fd8f7dc1f48
Signed-off-by: Pawel Wieczorek
---
test/security/k8s/vagrant/casablanca/Vagrantfile | 4 ++--
test/security/k8s/vagrant/dublin/Vagrantfile | 6 +++---
test/security/k8s/vagrant/dublin/cluster.yml | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'test/security')
diff --git a/test/security/k8s/vagrant/casablanca/Vagrantfile b/test/security/k8s/vagrant/casablanca/Vagrantfile
index 6d5ba4b81..c7e6883ce 100644
--- a/test/security/k8s/vagrant/casablanca/Vagrantfile
+++ b/test/security/k8s/vagrant/casablanca/Vagrantfile
@@ -10,8 +10,8 @@ vm_cpus = 1
vm_box = "generic/ubuntu1604"
cluster = [
- { name: 'master', hostname: 'master', ip: '172.17.0.100' },
- { name: 'worker', hostname: 'worker', ip: '172.17.0.101' }
+ { name: 'master', hostname: 'master', ip: '172.17.3.100' },
+ { name: 'worker', hostname: 'worker', ip: '172.17.3.101' }
]
Vagrant.configure('2') do |config|
diff --git a/test/security/k8s/vagrant/dublin/Vagrantfile b/test/security/k8s/vagrant/dublin/Vagrantfile
index b8abcd125..1ccc3ef9f 100644
--- a/test/security/k8s/vagrant/dublin/Vagrantfile
+++ b/test/security/k8s/vagrant/dublin/Vagrantfile
@@ -15,10 +15,10 @@ vm_memory = 2 * 1024
vm_cpus = 1
vm_box = "generic/ubuntu1804"
-operation = { name: 'operator', hostname: 'operator', ip: '172.17.0.254' }
+operation = { name: 'operator', hostname: 'operator', ip: '172.17.4.254' }
cluster = [
- { name: 'control', hostname: 'control', ip: '172.17.0.100' },
- { name: 'worker', hostname: 'worker', ip: '172.17.0.101' }
+ { name: 'control', hostname: 'control', ip: '172.17.4.100' },
+ { name: 'worker', hostname: 'worker', ip: '172.17.4.101' }
]
all = cluster.dup << operation
diff --git a/test/security/k8s/vagrant/dublin/cluster.yml b/test/security/k8s/vagrant/dublin/cluster.yml
index f06222209..df93a8863 100644
--- a/test/security/k8s/vagrant/dublin/cluster.yml
+++ b/test/security/k8s/vagrant/dublin/cluster.yml
@@ -1,7 +1,7 @@
# An example of a Kubernetes cluster for ONAP
ssh_key_path: &ssh_key_path "~/.ssh/onap-key"
nodes:
-- address: 172.17.0.100
+- address: 172.17.4.100
port: "22"
role:
- controlplane
@@ -9,7 +9,7 @@ nodes:
hostname_override: "onap-control-1"
user: vagrant
ssh_key_path: *ssh_key_path
-- address: 172.17.0.101
+- address: 172.17.4.101
port: "22"
role:
- worker
--
cgit 1.2.3-korg