summaryrefslogtreecommitdiffstats
path: root/xci/playbooks
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2018-10-13 12:48:23 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-10-13 12:48:23 +0000
commit4597bb3c4ff273a68d73883a9d87520517d60876 (patch)
treeef6799d9fcad953b9f8cffb004a174cc287abedd /xci/playbooks
parent3c4f0f674393efc212434f8a3cb2820badeb0390 (diff)
parent2435b4034bd55dd144af7b65c01feb41898a9640 (diff)
Merge "Simplify external networking for os"
Diffstat (limited to 'xci/playbooks')
-rw-r--r--xci/playbooks/roles/prepare-tests/defaults/main.yml10
-rw-r--r--xci/playbooks/roles/prepare-tests/tasks/main.yml14
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