Fix the pip required packages variable name
The SNI changes that merged in Idcf773e16d62d2ad76d9341177dd4d6c3e410af3 are not being picked up by py_pkgs and the repo build process because the variable name does not match the *_pip_packages format. Change-Id: Iea9857870c498d70f501aaf7d3528aad5737418e
This commit is contained in:
parent
30d59585e8
commit
17e59991da
|
@ -35,7 +35,7 @@ pip_source_install_options: ""
|
|||
# wheel and any other packages which must be installed when pip installs.
|
||||
pip_packages: []
|
||||
|
||||
pip_required_packages:
|
||||
pip_required_pip_packages:
|
||||
- pyOpenSSL # SSL SNI support
|
||||
- pyasn1 # SSL SNI support
|
||||
- ndg-httpsclient # SSL SNI support
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
|
||||
- name: Install required pip packages
|
||||
pip:
|
||||
name: "{{ pip_packages | map('quote') | join (' ') }} {{ pip_required_packages | map('quote') | join(' ') }}"
|
||||
name: "{{ pip_packages | map('quote') | join (' ') }} {{ pip_required_pip_packages | map('quote') | join(' ') }}"
|
||||
state: latest
|
||||
extra_args: "--upgrade --force-reinstall"
|
||||
register: install_packages
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
python /opt/get-pip.py {{ pip_source_install_options }} \
|
||||
{{ pip_get_pip_options }} \
|
||||
{{ pip_packages | map('quote') | join (' ') }} \
|
||||
{{ pip_required_packages | map('quote') | join(' ') }}
|
||||
{{ pip_required_pip_packages | map('quote') | join(' ') }}
|
||||
ignore_errors: true
|
||||
register: pip_install
|
||||
until: pip_install | success
|
||||
|
@ -30,7 +30,7 @@
|
|||
python /opt/get-pip.py --isolated {{ pip_source_install_options }} \
|
||||
{{ pip_get_pip_options }} \
|
||||
{{ pip_packages | map('quote') | join (' ') }} \
|
||||
{{ pip_required_packages | map('quote') | join(' ') }}
|
||||
{{ pip_required_pip_packages | map('quote') | join(' ') }}
|
||||
when: pip_install.rc != 0
|
||||
register: pip_install_fall_back
|
||||
until: pip_install_fall_back | success
|
||||
|
|
Loading…
Reference in New Issue