Skip to content

Commit

Permalink
Change Tempest pip install options
Browse files Browse the repository at this point in the history
Currently tempest_pip_instructions are set to be isolated to prevent
the use of the local repo restrictions and force the use of pypi as
a source for all requirements.

This patch changes the behaviour to respect the Tempest host's pip
configuration and to allow the use of pip_install_options which is
in keeping with the pattern across all other roles.

Change-Id: Ie616f309a77e6ee411fc53ed79392ccbf947b482
  • Loading branch information
Jesse Pretorius committed Mar 30, 2016
1 parent 5434f8a commit aa464d4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion defaults/main.yml
Expand Up @@ -119,7 +119,6 @@ tempest_images:
sha256: "34987d0d5702f8813f3ff9efe90e9e39e6926ec78658763580a79face67f3394"

tempest_enable_instance_password: True
tempest_pip_instructions: "--isolated"

## Tunable overrides
tempest_tempest_conf_overrides: {}
4 changes: 2 additions & 2 deletions tasks/tempest_install.yml
Expand Up @@ -95,7 +95,7 @@
state: present
virtualenv: "{{ tempest_git_dest }}"
virtualenv_site_packages: "no"
extra_args: "{{ tempest_pip_instructions }}"
extra_args: "{{ pip_install_options|default('') }}"
register: install_packages
until: install_packages|success
retries: 5
Expand All @@ -112,7 +112,7 @@
state: present
virtualenv: "{{ tempest_git_dest }}"
virtualenv_site_packages: "no"
extra_args: "{{ tempest_pip_instructions }}"
extra_args: "{{ pip_install_options|default('') }}"
register: install_packages
until: install_packages|success
retries: 5
Expand Down

0 comments on commit aa464d4

Please sign in to comment.