Remove pip_lock_to_internal_repo variable
The ability to lock the pip configuration down has now been extended so that it is possible to implement a different index and to use find-links to achieve the same goal. The only replacement implementation could be to disable the setting of an index if one wanted to *only* use wheels, but that is unnecessary in OSA builds as we are able to set the build to only use a specific set of wheels through the pypiserver on the repo container. As such, this variable has become useless and unused. This patch therefore removes it. Change-Id: If472c845036ab904ffc15ca7201ae68d282c1be0 Implements: blueprint python-build-install-simplification Signed-off-by: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
This commit is contained in:
parent
b6c653831e
commit
f9d65b184f
@ -73,14 +73,6 @@ pip_timeout: 120
|
||||
# Options for pip install
|
||||
pip_upgrade: true
|
||||
|
||||
# Enable/disable the configuration of the default index
|
||||
# False = default index is configured
|
||||
# True = default index is not configured
|
||||
# As this requires an alternative location to source
|
||||
# packages from, it requires there to be at least one
|
||||
# item in the pip_links list.
|
||||
pip_lock_to_internal_repo: False
|
||||
|
||||
# Default index for pip to use
|
||||
pip_default_index: https://pypi.python.org/simple
|
||||
|
||||
|
@ -1,6 +1,5 @@
|
||||
- name: Install pip and lock it down
|
||||
hosts: host_name
|
||||
- name: Install and configure pip
|
||||
hosts: all
|
||||
user: root
|
||||
roles:
|
||||
- role: "pip_install"
|
||||
pip_lock_to_internal_repo: True
|
||||
|
@ -13,28 +13,6 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
- name: Query pip-index
|
||||
uri:
|
||||
url: "{{ pip_default_index }}"
|
||||
method: HEAD
|
||||
failed_when: false
|
||||
register: default_index
|
||||
when:
|
||||
- pip_lock_to_internal_repo | bool
|
||||
tags:
|
||||
- always
|
||||
|
||||
- name: Check if pip-index is reachable
|
||||
fail:
|
||||
msg: |
|
||||
The pip index "{{ pip_default_index }}" was unreachable
|
||||
"{{ default_index.status }}"
|
||||
when:
|
||||
- pip_lock_to_internal_repo | bool
|
||||
- default_index.status != 200
|
||||
tags:
|
||||
- always
|
||||
|
||||
- name: Create pip config directory
|
||||
file:
|
||||
path: "{{ item }}"
|
||||
|
Loading…
Reference in New Issue
Block a user