From 2435b4034bd55dd144af7b65c01feb41898a9640 Mon Sep 17 00:00:00 2001
From: Manuel Buil <mbuil@suse.com>
Date: Mon, 8 Oct 2018 11:51:34 +0200
Subject: Simplify external networking for os
We were right now creating an overlay network with gateway in the opnfv
vm. This makes floating ips work but if we need internet connection from
vms, things get complicated and messy.
As we are only using up to 7 ips from the 192.168.122.0/24, we can
consider it the provider network for openstack and use ips starting from
192.168.122.100 as floating ips or ips for routing (doing SNAT as
always)
Change-Id: I09af663069ae95a9d265d98f1531778eb37134e2
Signed-off-by: Manuel Buil <mbuil@suse.com>
---
xci/playbooks/roles/prepare-tests/defaults/main.yml | 10 +++++-----
xci/playbooks/roles/prepare-tests/tasks/main.yml | 14 --------------
2 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/xci/playbooks/roles/prepare-tests/defaults/main.yml b/xci/playbooks/roles/prepare-tests/defaults/main.yml
index a3638302..7002586c 100644
--- a/xci/playbooks/roles/prepare-tests/defaults/main.yml
+++ b/xci/playbooks/roles/prepare-tests/defaults/main.yml
@@ -1,8 +1,8 @@
---
# Gateway parameters
-gateway_ip: "10.10.10.1"
-gateway_ip_mask: "10.10.10.1/24"
-broadcast_ip: "10.10.10.255"
+gateway_ip: "192.168.122.1"
+gateway_ip_mask: "192.168.122.1/24"
+broadcast_ip: "192.168.122.255"
gateway_interface: "br-vlan"
# Network parameters
@@ -10,5 +10,5 @@ external_network: "ext-net"
# Subnet parameters
subnet_name: "ext-subnet"
-allocation_pool: "start=10.10.10.5,end=10.10.10.254"
-subnet_cidr: "10.10.10.0/24"
+allocation_pool: "start=192.168.122.100,end=192.168.122.254"
+subnet_cidr: "192.168.122.0/24"
diff --git a/xci/playbooks/roles/prepare-tests/tasks/main.yml b/xci/playbooks/roles/prepare-tests/tasks/main.yml
index 1512bbab..45a23a3a 100644
--- a/xci/playbooks/roles/prepare-tests/tasks/main.yml
+++ b/xci/playbooks/roles/prepare-tests/tasks/main.yml
@@ -26,20 +26,6 @@
state: present
extra_args: '-c https://raw.githubusercontent.com/openstack/requirements/{{ requirements_git_install_branch }}/upper-constraints.txt'
-- name: create public network gateway for testing
- block:
- - name: check if the gateway was already set
- shell: "ip a | grep {{ gateway_ip }}"
- register: gateway_ip_result
- ignore_errors: True
- changed_when: False
-
- - name: add public network gateway
- command: "ip addr add {{ gateway_ip_mask }} brd {{ broadcast_ip }} dev {{ gateway_interface }}"
- changed_when: False
- when: gateway_ip_result|failed
- when: deploy_scenario is match("os-.*")
-
- name: prepare environment file for tests
template:
src: env.j2
--
cgit