Merge "Use get-pip script from repo release folder"

This commit is contained in:
Jenkins 2016-12-02 22:19:13 +00:00 committed by Gerrit Code Review
commit 1ab383a4e5
6 changed files with 38 additions and 4 deletions

View File

@ -0,0 +1,33 @@
---
# Copyright 2016, Rackspace US, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# This set of tasks checks whether the repo is up yet. If it is it
# will use the get-pip.py script available there. If it is not yet
# up, then it will use the standard upstream get-pip.py script URL.
- name: Test internal repo URL for the current get-pip.py script
uri:
url: "{{ pip_upstream_url }}"
method: "HEAD"
register: _repo_data_check
failed_when: false
when: pip_upstream_url != "https://bootstrap.pypa.io/get-pip.py"
- name: Set pip upstream URL
set_fact:
pip_upstream_url: "https://bootstrap.pypa.io/get-pip.py"
when:
- pip_upstream_url != "https://bootstrap.pypa.io/get-pip.py"
- (_repo_data_check.status | default(503)) != 200

View File

@ -49,6 +49,9 @@ pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
# The upper constraints to apply to all pip installations # The upper constraints to apply to all pip installations
pip_install_upper_constraints: "{{ openstack_repo_url }}/os-releases/{{ openstack_release }}/requirements_absolute_requirements.txt" pip_install_upper_constraints: "{{ openstack_repo_url }}/os-releases/{{ openstack_release }}/requirements_absolute_requirements.txt"
# The URL to retrieve the get-pip.py installation script
pip_upstream_url: "{{ (pip_offline_install | bool) | ternary('https://bootstrap.pypa.io/get-pip.py', openstack_repo_url ~ '/os-releases/' ~ openstack_release ~ '/get-pip.py') }}"
## OpenStack source options ## OpenStack source options
# URL for the frozen internal openstack repo. # URL for the frozen internal openstack repo.
repo_server_port: 8181 repo_server_port: 8181

View File

@ -20,6 +20,7 @@
user: root user: root
pre_tasks: pre_tasks:
- include: common-tasks/set-upper-constraints.yml - include: common-tasks/set-upper-constraints.yml
- include: common-tasks/set-pip-upstream-url.yml
- name: Check the state of the default LXC service log directory - name: Check the state of the default LXC service log directory
stat: stat:
path: "/var/log/lxc" path: "/var/log/lxc"

View File

@ -51,6 +51,7 @@
pre_tasks: pre_tasks:
- include: common-tasks/set-upper-constraints.yml - include: common-tasks/set-upper-constraints.yml
- include: common-tasks/set-pip-upstream-url.yml
- name: Load local packages - name: Load local packages
debug: debug:

View File

@ -20,8 +20,6 @@
user: root user: root
pre_tasks: pre_tasks:
- include: common-tasks/set-upper-constraints.yml
- name: Check if the git cache exists on deployment host - name: Check if the git cache exists on deployment host
local_action: local_action:
module: stat module: stat

View File

@ -18,8 +18,6 @@
- unbound_all - unbound_all
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ gather_facts | default(True) }}"
user: root user: root
pre_tasks:
- include: common-tasks/set-upper-constraints.yml
roles: roles:
- role: "unbound" - role: "unbound"
tags: tags: