Replace usage of netloc filters to urlsplit
Remove the references to netorigin and netloc_no_port as they will be taken out from openstack-ansible-plugins Now using ansible 2.4's urlsplit filter as a replacement. Change-Id: I94302ced3e5d6faa4d8748590f323e89d9b7280c Related-Bug: #1820830
This commit is contained in:
parent
6638604edf
commit
dcd9469411
|
@ -129,7 +129,7 @@
|
||||||
virtualenv_site_packages: "no"
|
virtualenv_site_packages: "no"
|
||||||
extra_args: >-
|
extra_args: >-
|
||||||
--index-url {{ repo_build_pip_default_index }}
|
--index-url {{ repo_build_pip_default_index }}
|
||||||
--trusted-host {{ repo_build_pip_default_index | netloc_no_port }}
|
--trusted-host {{ repo_build_pip_default_index | urlsplit('hostname') }}
|
||||||
--constraint {{ repo_build_release_path }}/requirements_constraints.txt
|
--constraint {{ repo_build_release_path }}/requirements_constraints.txt
|
||||||
{{ pip_install_options | default('') }}
|
{{ pip_install_options | default('') }}
|
||||||
register: install_packages
|
register: install_packages
|
||||||
|
@ -145,7 +145,7 @@
|
||||||
virtualenv_site_packages: "no"
|
virtualenv_site_packages: "no"
|
||||||
extra_args: >-
|
extra_args: >-
|
||||||
--index-url {{ repo_build_pip_default_index }}
|
--index-url {{ repo_build_pip_default_index }}
|
||||||
--trusted-host {{ repo_build_pip_default_index | netloc_no_port }}
|
--trusted-host {{ repo_build_pip_default_index | urlsplit('hostname') }}
|
||||||
--constraint {{ repo_build_release_path }}/requirements_constraints.txt
|
--constraint {{ repo_build_release_path }}/requirements_constraints.txt
|
||||||
{{ pip_install_options | default('') }}
|
{{ pip_install_options | default('') }}
|
||||||
register: install_packages
|
register: install_packages
|
||||||
|
|
|
@ -47,10 +47,10 @@
|
||||||
--no-binary :all:
|
--no-binary :all:
|
||||||
--constraint {{ repo_build_release_path }}/requirements_constraints.txt
|
--constraint {{ repo_build_release_path }}/requirements_constraints.txt
|
||||||
--index-url {{ repo_build_pip_default_index }}
|
--index-url {{ repo_build_pip_default_index }}
|
||||||
--trusted-host {{ repo_build_pip_default_index | netloc_no_port }}
|
--trusted-host {{ repo_build_pip_default_index | urlsplit('hostname') }}
|
||||||
{% if repo_build_pip_extra_indexes is defined %}
|
{% if repo_build_pip_extra_indexes is defined %}
|
||||||
--extra-index-url {{ repo_build_pip_extra_indexes | join(' --extra-index-url ') }}
|
--extra-index-url {{ repo_build_pip_extra_indexes | join(' --extra-index-url ') }}
|
||||||
--trusted-host {{ repo_build_pip_extra_indexes | map('netloc_no_port') | join(' --trusted-host ') }}
|
--trusted-host {{ repo_build_pip_extra_indexes | map(urlsplit('hostname')) | join(' --trusted-host ') }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
--requirement {{ repo_build_release_path }}/requirements.txt
|
--requirement {{ repo_build_release_path }}/requirements.txt
|
||||||
{{ pip_install_options }}
|
{{ pip_install_options }}
|
||||||
|
@ -72,10 +72,10 @@
|
||||||
--no-binary {{ repo_build_pip_no_binary | join(' --no-binary ') }}
|
--no-binary {{ repo_build_pip_no_binary | join(' --no-binary ') }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
--index-url {{ repo_build_pip_default_index }}
|
--index-url {{ repo_build_pip_default_index }}
|
||||||
--trusted-host {{ repo_build_pip_default_index | netloc_no_port }}
|
--trusted-host {{ repo_build_pip_default_index | urlsplit('hostname') }}
|
||||||
{% if repo_build_pip_extra_indexes is defined %}
|
{% if repo_build_pip_extra_indexes is defined %}
|
||||||
--extra-index-url {{ repo_build_pip_extra_indexes | join(' --extra-index-url ') }}
|
--extra-index-url {{ repo_build_pip_extra_indexes | join(' --extra-index-url ') }}
|
||||||
--trusted-host {{ repo_build_pip_extra_indexes | map('netloc_no_port') | join(' --trusted-host ') }}
|
--trusted-host {{ repo_build_pip_extra_indexes | map(urlsplit('hostname')) | join(' --trusted-host ') }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
--build {{ repo_build_dir }}
|
--build {{ repo_build_dir }}
|
||||||
--requirement {{ repo_build_release_path }}/requirements.txt
|
--requirement {{ repo_build_release_path }}/requirements.txt
|
||||||
|
|
|
@ -52,7 +52,7 @@
|
||||||
|
|
||||||
- name: Set Ubuntu Cloud Archive repo URL based on discovered information
|
- name: Set Ubuntu Cloud Archive repo URL based on discovered information
|
||||||
set_fact:
|
set_fact:
|
||||||
uca_apt_repo_url: "{{ ubuntu_repo_url.stdout | netorigin }}/ubuntu-cloud-archive"
|
uca_apt_repo_url: "{{ ubuntu_repo_url.stdout | urlsplit('scheme') ~ '://' ~ urlsplit('netloc') }}/ubuntu-cloud-archive"
|
||||||
when:
|
when:
|
||||||
- ansible_pkg_mgr == 'apt'
|
- ansible_pkg_mgr == 'apt'
|
||||||
- nodepool.stat.exists | bool
|
- nodepool.stat.exists | bool
|
||||||
|
|
Loading…
Reference in New Issue