Merge "Remove tempest_pip_instructions from group_vars"

This commit is contained in:
Jenkins 2016-03-31 06:20:56 +00:00 committed by Gerrit Code Review
commit 3e588752ae

View File

@ -273,16 +273,6 @@ openrc_os_password: "{{ keystone_auth_admin_password }}"
openrc_os_domain_name: "Default"
## Tempest Options
tempest_pip_instructions: >
--isolated
--pre
--index-url {{ repo_pip_default_index }}
--extra-index-url https://pypi.python.org/simple
--trusted-host pypi.python.org
--trusted-host {{ openstack_repo_url | netloc_no_port }}
## HAProxy
haproxy_bind_on_non_local: "{% if groups.haproxy[1] is defined and internal_lb_vip_address != external_lb_vip_address %}True{% else %}False{% endif %}"
haproxy_use_keepalived: "{% if groups.haproxy|length > 1 %}True{% else %}False{% endif %}"