Use a common python build/install role
In order to radically simplify how we prepare the service venvs, we use a common role to do the wheel builds and the venv preparation. This makes the process far simpler to understand, because the role does its own building and installing. It also reduces the code maintenance burden, because instead of duplicating the build processes in the repo_build role and the service role - we only have it all done in a single place. We also change the role venv tag var to use the integrated build's common venv tag so that we can remove the role's venv tag in group_vars in the integrated build. This reduces memory consumption and also reduces the duplication. This is by no means the final stop in the simplification process, but it is a step forward. The will be work to follow which: 1. Replaces 'developer mode' with an equivalent mechanism that uses the common role and is simpler to understand. We will also simplify the provisioning of pip install arguments when doing this. 2. Uses Rally's own in-repo upper constraints, instead of the OpenStack requirements repo constraints. Depends-On: https://review.openstack.org/598957 Change-Id: I3f70f7879d399c36fb8d145e69ce4a609157ec30 Implements: blueprint python-build-install-simplification Signed-off-by: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
This commit is contained in:
Jesse Pretorius
Jesse Pretorius (odyssey4me)
parent
d61d3acc68
commit
9fdc3ab178
@ -35,9 +35,19 @@ rally_developer_mode: false
|
||||
rally_developer_constraints:
|
||||
- "git+{{ rally_git_repo }}@{{ rally_git_install_branch }}#egg=rally"
|
||||
|
||||
# TODO(odyssey4me):
|
||||
# This can be simplified once all the roles are using
|
||||
# python_venv_build. We can then switch to using a
|
||||
# set of constraints in pip.conf inside the venv,
|
||||
# perhaps prepared by giving a giving a list of
|
||||
# constraints to the role.
|
||||
rally_pip_install_args: >-
|
||||
{{ rally_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }}
|
||||
{{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''), '') }}
|
||||
{{ pip_install_options | default('') }}
|
||||
|
||||
# Name of the virtual env to deploy into
|
||||
rally_venv_tag: untagged
|
||||
rally_venv_tag: "{{ venv_tag | default('untagged') }}"
|
||||
rally_bin: "/openstack/venvs/rally-{{ rally_venv_tag }}/bin"
|
||||
|
||||
# venv_download, even when true, will use the fallback method of building the
|
||||
|
||||
@ -13,17 +13,12 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
- name: Install distro packages
|
||||
package:
|
||||
name: "{{ rally_distro_packages }}"
|
||||
state: "{{ rally_package_state }}"
|
||||
update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}"
|
||||
cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}"
|
||||
register: install_packages
|
||||
until: install_packages is success
|
||||
retries: 5
|
||||
delay: 2
|
||||
|
||||
# TODO(odyssey4me):
|
||||
# This can be simplified once all the roles are using
|
||||
# python_venv_build. We can then switch to using a
|
||||
# set of constraints in pip.conf inside the venv,
|
||||
# perhaps prepared by giving a giving a list of
|
||||
# constraints to the role.
|
||||
- name: Create developer mode constraint file
|
||||
copy:
|
||||
dest: "/opt/developer-pip-constraints.txt"
|
||||
@ -33,87 +28,22 @@
|
||||
{% endfor %}
|
||||
when: rally_developer_mode | bool
|
||||
|
||||
- name: Retrieve checksum for venv download
|
||||
uri:
|
||||
url: "{{ rally_venv_download_url | replace('tgz', 'checksum') }}"
|
||||
return_content: yes
|
||||
register: rally_venv_checksum
|
||||
when: rally_venv_download | bool
|
||||
|
||||
- name: Attempt venv download
|
||||
get_url:
|
||||
url: "{{ rally_venv_download_url }}"
|
||||
dest: "/var/cache/{{ rally_venv_download_url | basename }}"
|
||||
checksum: "sha1:{{ rally_venv_checksum.content | trim }}"
|
||||
register: rally_get_venv
|
||||
when: rally_venv_download | bool
|
||||
|
||||
- name: Remove existing venv
|
||||
file:
|
||||
path: "{{ rally_bin | dirname }}"
|
||||
state: absent
|
||||
when: rally_get_venv is changed
|
||||
|
||||
- name: Create rally venv dir
|
||||
file:
|
||||
path: "{{ rally_bin | dirname }}"
|
||||
state: directory
|
||||
when: rally_get_venv is changed
|
||||
|
||||
- name: Unarchive pre-built venv
|
||||
unarchive:
|
||||
src: "/var/cache/{{ rally_venv_download_url | basename }}"
|
||||
dest: "{{ rally_bin | dirname }}"
|
||||
copy: "no"
|
||||
when: rally_get_venv is changed
|
||||
|
||||
- name: Install pip packages
|
||||
pip:
|
||||
name: "{{ rally_pip_packages }}"
|
||||
state: "{{ rally_pip_package_state }}"
|
||||
virtualenv: "{{ rally_bin | dirname }}"
|
||||
virtualenv_site_packages: "no"
|
||||
extra_args: >-
|
||||
{{ rally_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }}
|
||||
{{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
|
||||
{{ pip_install_options | default('') }}
|
||||
register: install_packages
|
||||
until: install_packages is success
|
||||
retries: 5
|
||||
delay: 2
|
||||
when: rally_get_venv | failed or rally_get_venv | skipped
|
||||
|
||||
- name: CentOS remove python from path first
|
||||
file:
|
||||
path: "{{ rally_bin | dirname }}/bin/python2.7"
|
||||
state: "absent"
|
||||
- name: Ensure remote wheel building is disabled in developer mode
|
||||
set_fact:
|
||||
venv_build_host: "{{ ansible_hostname }}"
|
||||
when:
|
||||
- ansible_pkg_mgr == 'yum'
|
||||
- rally_get_venv is changed
|
||||
- rally_developer_mode | bool
|
||||
|
||||
# NOTE(odyssey4me):
|
||||
# We reinitialize the venv to ensure that the right
|
||||
# version of python is in the venv, but we do not
|
||||
# want virtualenv to also replace pip, setuptools
|
||||
# and wheel so we tell it not to.
|
||||
# We do not use --always-copy for CentOS/SuSE due
|
||||
# to https://github.com/pypa/virtualenv/issues/565
|
||||
- name: Reset virtualenv and update its paths
|
||||
shell: |
|
||||
find {{ rally_bin }} -name \*.pyc -delete
|
||||
sed -si '1s/^.*python.*$/#!{{ rally_bin | replace ('/','\/') }}\/python/' {{ rally_bin }}/*
|
||||
virtualenv {{ rally_bin | dirname }} \
|
||||
{{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \
|
||||
--no-pip \
|
||||
--no-setuptools \
|
||||
--no-wheel
|
||||
when: rally_get_venv is changed
|
||||
tags:
|
||||
- skip_ansible_lint
|
||||
|
||||
- name: Record the venv tag deployed
|
||||
ini_file:
|
||||
dest: "/etc/ansible/facts.d/openstack_ansible.fact"
|
||||
section: rally
|
||||
option: venv_tag
|
||||
value: "{{ rally_venv_tag }}"
|
||||
- name: Install the python venv
|
||||
include_role:
|
||||
name: "python_venv_build"
|
||||
private: yes
|
||||
vars:
|
||||
venv_install_destination_path: "{{ rally_bin | dirname }}"
|
||||
venv_install_distro_package_list: "{{ rally_distro_packages }}"
|
||||
venv_pip_install_args: "{{ rally_pip_install_args }}"
|
||||
venv_pip_packages: "{{ rally_pip_packages }}"
|
||||
venv_facts_when_changed:
|
||||
- section: "rally"
|
||||
option: "venv_tag"
|
||||
value: "{{ rally_venv_tag }}"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user