diff --git a/playbooks/roles/bifrost-ironic-install/defaults/main.yml b/playbooks/roles/bifrost-ironic-install/defaults/main.yml index 3b1996c93..f2f36f277 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/main.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/main.yml @@ -354,8 +354,6 @@ keystone: password: "{{ service_password }}" host: localhost -pip_opts: "{{ lookup('env', 'PIP_OPTS') | default('') }}" - # Timeout for gathering facts. fact_gather_timeout: "{{ lookup('config', 'DEFAULT_GATHER_TIMEOUT', on_missing='skip') | default(omit, true) }}" diff --git a/playbooks/roles/bifrost-ironic-install/tasks/inspector_install.yml b/playbooks/roles/bifrost-ironic-install/tasks/inspector_install.yml index 68748f23f..8ffc79c85 100644 --- a/playbooks/roles/bifrost-ironic-install/tasks/inspector_install.yml +++ b/playbooks/roles/bifrost-ironic-install/tasks/inspector_install.yml @@ -20,7 +20,6 @@ package: ironic-inspector sourcedir: "{{ ironicinspector_git_folder }}" source_install: "{{ ironicinspector_source_install }}" - extra_args: "--no-cache-dir {{ pip_opts }}" - name: "Inspector - client install" include_role: @@ -29,4 +28,3 @@ package: python-ironic-inspector-client sourcedir: "{{ ironicinspectorclient_git_folder }}" source_install: "{{ ironicinspectorclient_source_install }}" - extra_args: "--no-cache-dir {{ pip_opts }}" diff --git a/playbooks/roles/bifrost-ironic-install/tasks/install.yml b/playbooks/roles/bifrost-ironic-install/tasks/install.yml index 6105c7ee3..1f982ba11 100644 --- a/playbooks/roles/bifrost-ironic-install/tasks/install.yml +++ b/playbooks/roles/bifrost-ironic-install/tasks/install.yml @@ -102,7 +102,6 @@ package: ironic sourcedir: "{{ ironic_git_folder }}" source_install: true - extra_args: "--no-cache-dir {{ pip_opts }}" - name: "Install ironic-inspector to permit use of inspection interface" include_tasks: inspector_install.yml diff --git a/playbooks/roles/bifrost-ironic-install/tasks/prometheus_exporter_install.yml b/playbooks/roles/bifrost-ironic-install/tasks/prometheus_exporter_install.yml index 487f3087c..ec52d984d 100644 --- a/playbooks/roles/bifrost-ironic-install/tasks/prometheus_exporter_install.yml +++ b/playbooks/roles/bifrost-ironic-install/tasks/prometheus_exporter_install.yml @@ -24,4 +24,3 @@ package: ironic-prometheus-exporter sourcedir: "{{ prometheus_exporter_git_folder }}" source_install: "{{ prometheus_exporter_source_install }}" - extra_args: "--no-cache-dir {{ pip_opts }}" diff --git a/playbooks/roles/bifrost-ironic-install/tasks/staging_install.yml b/playbooks/roles/bifrost-ironic-install/tasks/staging_install.yml index 3f146894f..5936d514e 100644 --- a/playbooks/roles/bifrost-ironic-install/tasks/staging_install.yml +++ b/playbooks/roles/bifrost-ironic-install/tasks/staging_install.yml @@ -20,4 +20,3 @@ package: ironic-staging-drivers sourcedir: "{{ staging_drivers_git_folder }}" source_install: "{{ staging_drivers_source_install }}" - extra_args: "--no-cache-dir --upgrade-strategy only-if-needed" diff --git a/playbooks/roles/bifrost-keystone-install/defaults/main.yml b/playbooks/roles/bifrost-keystone-install/defaults/main.yml index 730b3993b..bf1270db1 100644 --- a/playbooks/roles/bifrost-keystone-install/defaults/main.yml +++ b/playbooks/roles/bifrost-keystone-install/defaults/main.yml @@ -84,8 +84,6 @@ keystone: password: "{{ service_password }}" host: localhost -pip_opts: "{{ lookup('env', 'PIP_OPTS') | default('') }}" - # Enable TLS support. enable_tls: false tls_root: /etc/bifrost diff --git a/playbooks/roles/bifrost-keystone-install/tasks/install.yml b/playbooks/roles/bifrost-keystone-install/tasks/install.yml index 3f9349bee..988e8693a 100644 --- a/playbooks/roles/bifrost-keystone-install/tasks/install.yml +++ b/playbooks/roles/bifrost-keystone-install/tasks/install.yml @@ -48,4 +48,3 @@ package: keystone sourcedir: "{{ keystone_git_folder }}" source_install: "{{ keystone_source_install }}" - extra_args: "--no-cache-dir {{ pip_opts }}" diff --git a/playbooks/roles/bifrost-pip-install/defaults/main.yml b/playbooks/roles/bifrost-pip-install/defaults/main.yml index e73423bdd..f8e3b7657 100644 --- a/playbooks/roles/bifrost-pip-install/defaults/main.yml +++ b/playbooks/roles/bifrost-pip-install/defaults/main.yml @@ -8,9 +8,12 @@ skip_install: false source_install: false ansible_python_interpreter: "{{ bifrost_venv_dir + '/bin/python3' }}" +# Older compatibility options +pip_opts: "{{ lookup('env', 'PIP_OPTS') | default('') }}" + # Pip options developer_mode: false -extra_args: +extra_args: "{{ pip_opts }}" pip_install_retries: 5 pip_install_delay: 10 reqs_git_folder: /opt/stack/requirements diff --git a/playbooks/roles/bifrost-pip-install/tasks/main.yml b/playbooks/roles/bifrost-pip-install/tasks/main.yml index b29132a51..470ff4604 100644 --- a/playbooks/roles/bifrost-pip-install/tasks/main.yml +++ b/playbooks/roles/bifrost-pip-install/tasks/main.yml @@ -51,7 +51,7 @@ - name: "Install requirements from {{ sourcedir }} using pip" pip: - extra_args: "{{ extra_args | default('') }} {% if upper_constraints_file %}-c {{ upper_constraints_file }}{% endif %}" + extra_args: "{{ extra_args }} {% if upper_constraints_file %}-c {{ upper_constraints_file }}{% endif %}" requirements: "{{ sourcedir }}/requirements.txt" register: pip_package_install_done until: pip_package_install_done is succeeded @@ -66,7 +66,7 @@ pip: name: "{{ sourcedir }}" editable: "{{ developer_mode | bool }}" - extra_args: "{{ extra_args | default('') }}" + extra_args: "{{ extra_args }}" when: source_install | bool environment: "{{ bifrost_venv_env | combine({'SETUPTOOLS_USE_DISTUTILS': 'stdlib'}) }}" diff --git a/releasenotes/notes/pip-opts-63bdff0ef22a56f3.yaml b/releasenotes/notes/pip-opts-63bdff0ef22a56f3.yaml new file mode 100644 index 000000000..d33de7043 --- /dev/null +++ b/releasenotes/notes/pip-opts-63bdff0ef22a56f3.yaml @@ -0,0 +1,4 @@ +--- +other: + - | + No longer passes ``--no-cache-dir`` to pip by default.