openstack
/
tripleo-ci
Code Issues Proposed changes

Merge "Fix pingtest for nonha ovb oooq job"

This commit is contained in:
Jenkins 2017-01-18 22:17:16 +00:00 committed by Gerrit Code Review
parent 8025788c59 33215bc3d1
commit 9ef0e50f7d
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/quickstart/ovb-settings.yml
View File

@ -13,18 +13,6 @@ external_interface_ip: 10.0.0.1
external_interface_netmask: 255.255.255.0
external_interface_hwaddr: fa:16:3e:79:e8:04
float_base: "{% if not containerized_overcloud|default('false')|bool %}10.0.0{% else %}192.168.24{% endif %}"
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"
# Running quickstart with its own config
network_isolation_type: network-isolation
network_isolation: true
enable_pacemaker: true
deploy_timeout: 110
# Running quickstart as tripleo-ci exactly
step_introspect: "{{ lookup('env','INTROSPECT')|bool }}"
undercloud_generate_service_certificate: "{{ lookup('env','UNDERCLOUD_SSL')|bool }}"
@ -33,6 +21,16 @@ enable_pacemaker: "{{ lookup('env','PACEMAKER')|bool }}"
deploy_args: "{{ lookup('env','OVERCLOUD_DEPLOY_ARGS') }}"
network_isolation: "{{ lookup('env','NETISO_V4')|bool }}"
float_base: "{% if network_isolation|bool %}10.0.0{% else %}192.168.24{% endif %}"
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"
# Running quickstart with its own config
network_isolation_type: network-isolation
deploy_timeout: 110
# Overcloud deploy
overcloud_templates_path: /usr/share/openstack-tripleo-heat-templates