Remove environment network settings from fs files
Move all network settings to environment OVB file in CI, leaving only features here. Depends-On: I695b3eddb821821bfba0566dfa599e5a5b264d6a Change-Id: I7345318bcba633f5384313c25be0716d0a425070
This commit is contained in:
parent
d683de2d08
commit
18cf8f48e7
|
@ -25,22 +25,6 @@ telemetry_args: >-
|
|||
-e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
|
||||
{% endif %}
|
||||
|
||||
# Network settings
|
||||
external_interface: eth2
|
||||
external_interface_ip: 10.0.0.1
|
||||
external_interface_netmask: 255.255.255.0
|
||||
external_interface_hwaddr: fa:16:3e:79:e8:04
|
||||
floating_ip_cidr: 10.0.0.0/24
|
||||
step_adjust_mtu: true
|
||||
mtu: 1350
|
||||
mtu_interface:
|
||||
- eth0
|
||||
- eth1
|
||||
- eth2
|
||||
overcloud_dns_servers:
|
||||
- 8.8.8.8
|
||||
- 8.8.4.4
|
||||
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
test_ping: true
|
||||
|
|
|
@ -24,22 +24,6 @@ network_isolation_args: >-
|
|||
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-environment.yaml
|
||||
-e {{ tripleo_root }}/tripleo-ci/test-environments/net-iso.yaml
|
||||
|
||||
# Network settings
|
||||
external_interface: eth2
|
||||
external_interface_ip: 10.0.0.1
|
||||
external_interface_netmask: 255.255.255.0
|
||||
external_interface_hwaddr: fa:16:3e:79:e8:04
|
||||
floating_ip_cidr: 10.0.0.0/24
|
||||
step_adjust_mtu: true
|
||||
mtu: 1350
|
||||
mtu_interface:
|
||||
- eth0
|
||||
- eth1
|
||||
- eth2
|
||||
overcloud_dns_servers:
|
||||
- 8.8.8.8
|
||||
- 8.8.4.4
|
||||
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
test_ping: true
|
||||
|
|
|
@ -17,20 +17,6 @@ step_introspect: true
|
|||
enable_pacemaker: false
|
||||
network_isolation: false
|
||||
|
||||
# Network settings
|
||||
floating_ip_cidr: 192.168.24.0/24
|
||||
public_net_pool_start: 192.168.24.150
|
||||
public_net_pool_end: 192.168.24.250
|
||||
public_net_gateway: 192.168.24.1
|
||||
step_adjust_mtu: true
|
||||
mtu: 1350
|
||||
mtu_interface:
|
||||
- eth0
|
||||
- eth1
|
||||
overcloud_dns_servers:
|
||||
- 8.8.8.8
|
||||
- 8.8.4.4
|
||||
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
|
||||
|
|
|
@ -18,22 +18,6 @@ network_isolation_args: >-
|
|||
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-environment.yaml
|
||||
-e {{ tripleo_root }}/tripleo-ci/test-environments/net-iso.yaml
|
||||
|
||||
# Network settings
|
||||
external_interface: eth2
|
||||
external_interface_ip: 10.0.0.1
|
||||
external_interface_netmask: 255.255.255.0
|
||||
external_interface_hwaddr: fa:16:3e:79:e8:04
|
||||
floating_ip_cidr: 10.0.0.0/24
|
||||
step_adjust_mtu: true
|
||||
mtu: 1350
|
||||
mtu_interface:
|
||||
- eth0
|
||||
- eth1
|
||||
- eth2
|
||||
overcloud_dns_servers:
|
||||
- 8.8.8.8
|
||||
- 8.8.4.4
|
||||
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
test_ping: false
|
||||
|
|
|
@ -20,20 +20,6 @@ telemetry_args: >-
|
|||
enable_pacemaker: false
|
||||
network_isolation: false
|
||||
overcloud_ipv6: false
|
||||
float_base: "192.168.24"
|
||||
floating_ip_cidr: "{{ float_base}}.0/24"
|
||||
public_net_pool_start: "{{ float_base}}.150"
|
||||
public_net_pool_end: "{{ float_base}}.250"
|
||||
public_net_gateway: "{{ float_base}}.1"
|
||||
step_adjust_mtu: true
|
||||
mtu: 1350
|
||||
mtu_interface:
|
||||
- eth0
|
||||
- eth1
|
||||
overcloud_dns_servers:
|
||||
- 8.8.8.8
|
||||
- 8.8.4.4
|
||||
|
||||
# If `run_tempest` is `true`, run tempests tests, otherwise do not
|
||||
# run them.
|
||||
tempest_config: false
|
||||
|
|
Loading…
Reference in New Issue