diff --git a/defaults/main.yml b/defaults/main.yml index ca4a21a..5ab232f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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 diff --git a/examples/playbook.yml b/examples/playbook.yml index 8e349d8..5e56d4d 100644 --- a/examples/playbook.yml +++ b/examples/playbook.yml @@ -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 diff --git a/tasks/configure.yml b/tasks/configure.yml index f8ad695..ad17536 100644 --- a/tasks/configure.yml +++ b/tasks/configure.yml @@ -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 }}"