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. Simplifies the installation of optional pip packages.
   Right now it's more complicated than it needs to be due
   to us needing to keep the py_pkgs plugin working in the
   integrated build.

Depends-On: https://review.openstack.org/598957
Change-Id: I2eba8e7ca3f66169094264f31f3e182287dfa9b2
Implements: blueprint python-build-install-simplification
Signed-off-by: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
This commit is contained in:
Jesse Pretorius 2018-03-27 22:35:24 +01:00 committed by Jesse Pretorius (odyssey4me)
parent a3a584b6f1
commit 96fb59ac5a
3 changed files with 44 additions and 116 deletions

View File

@ -26,8 +26,19 @@ molteniron_developer_mode: false
molteniron_developer_constraints:
- "git+{{ molteniron_git_repo }}@{{ molteniron_git_install_branch }}#egg=molteniron"
# 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.
molteniron_pip_install_args: >-
{{ molteniron_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
molteniron_venv_tag: untagged
molteniron_venv_tag: "{{ venv_tag | default('untagged') }}"
molteniron_bin: "/openstack/venvs/molteniron-{{ molteniron_venv_tag }}/bin"
molteniron_venv_download_url: http://127.0.0.1/venvs/untagged/ubuntu/molteniron.tgz

View File

@ -13,121 +13,38 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- name: Install distro packages
package:
name: "{{ molteniron_distro_packages }}"
state: "{{ molteniron_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"
content: |
{% for item in molteniron_developer_constraints %}
{{ item }}
{% endfor %}
when: molteniron_developer_mode | bool
- name: Install developer mode distro packages
package:
name: "{{ molteniron_developer_mode_distro_packages }}"
state: "{{ molteniron_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
- name: Ensure remote wheel building is disabled in developer mode
set_fact:
venv_build_host: "{{ ansible_hostname }}"
when:
- molteniron_developer_mode | bool
- name: Install required pip packages
pip:
name: "{{ molteniron_requires_pip_packages | join(' ') }}"
state: "{{ molteniron_package_state }}"
extra_args: >-
{{ molteniron_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
- name: Retrieve checksum for venv download
uri:
url: "{{ molteniron_venv_download_url | replace('tgz', 'checksum') }}"
return_content: yes
register: molteniron_venv_checksum
when: not molteniron_developer_mode | bool
- name: Attempt venv download
get_url:
url: "{{ molteniron_venv_download_url }}"
dest: "/var/cache/{{ molteniron_venv_download_url | basename }}"
checksum: "sha1:{{ molteniron_venv_checksum.content | trim }}"
register: molteniron_get_venv
when: not molteniron_developer_mode | bool
- name: Remove existing venv
file:
path: "{{ molteniron_bin | dirname }}"
state: absent
when: molteniron_get_venv is changed
- name: Create molteniron venv dir
file:
path: "{{ molteniron_bin | dirname }}"
state: directory
register: molteniron_venv_dir
when: not molteniron_developer_mode | bool
- name: Unarchive pre-built venv
unarchive:
src: "/var/cache/{{ molteniron_venv_download_url | basename }}"
dest: "{{ molteniron_bin | dirname }}"
copy: "no"
when:
- not molteniron_developer_mode | bool
- molteniron_get_venv | changed or molteniron_venv_dir is changed
- name: Install pip packages
pip:
name: "{{ molteniron_pip_packages | join(' ') }}"
state: "{{ molteniron_package_state }}"
virtualenv: "{{ molteniron_bin | dirname }}"
virtualenv_site_packages: "no"
extra_args: >-
{{ molteniron_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: molteniron_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: Update virtualenv path
shell: |
find {{ molteniron_bin }} -name \*.pyc -delete
sed -si '1s/^.*python.*$/#!{{ molteniron_bin | replace ('/','\/') }}\/python/' {{ molteniron_bin }}/*
virtualenv {{ molteniron_bin | dirname }} \
{{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \
--no-pip \
--no-setuptools \
--no-wheel
when:
- not molteniron_developer_mode | bool
- molteniron_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: molteniron
option: venv_tag
value: "{{ molteniron_venv_tag }}"
- name: Install the python venv
include_role:
name: "python_venv_build"
private: yes
vars:
venv_build_distro_package_list: "{{ molteniron_devel_distro_packages }}"
venv_install_destination_path: "{{ molteniron_bin | dirname }}"
venv_install_distro_package_list: "{{ molteniron_distro_packages }}"
venv_pip_install_args: "{{ molteniron_pip_install_args }}"
venv_pip_packages: "{{ molteniron_pip_packages }}"
venv_facts_when_changed:
- section: "molteniron"
option: "venv_tag"
value: "{{ molteniron_venv_tag }}"

View File

@ -25,7 +25,7 @@ molteniron_distro_packages:
- mysql-server
- python-mysqldb
molteniron_developer_mode_distro_packages:
molteniron_devel_distro_packages:
- git-core
- python-dev
- python3-dev