Merge "Use a common python build/install role"
This commit is contained in:
commit
d8aa793f9e
|
@ -40,8 +40,20 @@ aodh_git_install_branch: master
|
|||
aodh_developer_constraints:
|
||||
- "git+{{ aodh_git_repo }}@{{ aodh_git_install_branch }}#egg=aodh"
|
||||
|
||||
# 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.
|
||||
aodh_pip_install_args: >-
|
||||
{{ aodh_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
|
||||
aodh_venv_tag: untagged
|
||||
aodh_venv_tag: "{{ venv_tag | default('untagged') }}"
|
||||
aodh_bin: "{{ _aodh_bin }}"
|
||||
|
||||
# venv_download, even when true, will use the fallback method of building the
|
||||
|
|
|
@ -24,7 +24,9 @@
|
|||
until: _stop is success
|
||||
retries: 5
|
||||
delay: 2
|
||||
listen: Restart aodh services
|
||||
listen:
|
||||
- "Restart aodh services"
|
||||
- "venv changed"
|
||||
|
||||
# Note (odyssey4me):
|
||||
# The policy.json file is currently read continually by the services
|
||||
|
@ -42,7 +44,9 @@
|
|||
group: "{{ aodh_system_group_name }}"
|
||||
mode: "0640"
|
||||
remote_src: yes
|
||||
listen: Restart aodh services
|
||||
listen:
|
||||
- "Restart aodh services"
|
||||
- "venv changed"
|
||||
|
||||
- name: Start services
|
||||
service:
|
||||
|
@ -55,7 +59,9 @@
|
|||
until: _start is success
|
||||
retries: 5
|
||||
delay: 2
|
||||
listen: Restart aodh services
|
||||
listen:
|
||||
- "Restart aodh services"
|
||||
- "venv changed"
|
||||
|
||||
- name: Restart web server
|
||||
service:
|
||||
|
|
|
@ -13,6 +13,12 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# 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"
|
||||
|
@ -22,103 +28,24 @@
|
|||
{% endfor %}
|
||||
when: aodh_developer_mode | bool
|
||||
|
||||
- name: Retrieve checksum for venv download
|
||||
uri:
|
||||
url: "{{ aodh_venv_download_url | replace('tgz', 'checksum') }}"
|
||||
return_content: yes
|
||||
register: aodh_venv_checksum
|
||||
when: aodh_venv_download | bool
|
||||
|
||||
- name: Attempt venv download
|
||||
get_url:
|
||||
url: "{{ aodh_venv_download_url }}"
|
||||
dest: "/var/cache/{{ aodh_venv_download_url | basename }}"
|
||||
checksum: "sha1:{{ aodh_venv_checksum.content | trim }}"
|
||||
register: aodh_get_venv
|
||||
when: aodh_venv_download | bool
|
||||
|
||||
- name: Remove existing venv
|
||||
file:
|
||||
path: "{{ aodh_bin | dirname }}"
|
||||
state: absent
|
||||
when: aodh_get_venv is changed
|
||||
|
||||
- name: Create aodh venv dir
|
||||
file:
|
||||
path: "{{ aodh_bin | dirname }}"
|
||||
state: directory
|
||||
mode: "0755"
|
||||
register: aodh_venv_dir
|
||||
when: aodh_get_venv is changed
|
||||
|
||||
- name: Unarchive pre-built venv
|
||||
unarchive:
|
||||
src: "/var/cache/{{ aodh_venv_download_url | basename }}"
|
||||
dest: "{{ aodh_bin | dirname }}"
|
||||
copy: "no"
|
||||
when: aodh_get_venv is changed
|
||||
notify: Restart aodh services
|
||||
|
||||
- name: Install pip packages
|
||||
pip:
|
||||
name: "{{ aodh_pip_packages }}"
|
||||
state: "{{ aodh_pip_package_state }}"
|
||||
virtualenv: "{{ aodh_bin | dirname }}"
|
||||
virtualenv_site_packages: "no"
|
||||
extra_args: >-
|
||||
{{ aodh_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: aodh_get_venv | failed or aodh_get_venv | skipped
|
||||
notify: Restart aodh services
|
||||
|
||||
- name: Remove python from path first (CentOS, openSUSE)
|
||||
file:
|
||||
path: "{{ aodh_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 in ['yum', 'dnf', 'zypper']
|
||||
- aodh_get_venv is changed
|
||||
- aodh_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 {{ aodh_bin }} -name \*.pyc -delete
|
||||
sed -si '1s/^.*python.*$/#!{{ aodh_bin | replace ('/','\/') }}\/python/' {{ aodh_bin }}/*
|
||||
virtualenv {{ aodh_bin | dirname }} \
|
||||
{{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \
|
||||
--no-pip \
|
||||
--no-setuptools \
|
||||
--no-wheel
|
||||
when: aodh_get_venv is changed
|
||||
tags:
|
||||
- skip_ansible_lint
|
||||
- name: Install the python venv
|
||||
include_role:
|
||||
name: "python_venv_build"
|
||||
private: yes
|
||||
vars:
|
||||
venv_build_distro_package_list: "{{ aodh_devel_distro_packages }}"
|
||||
venv_install_destination_path: "{{ aodh_bin | dirname }}"
|
||||
venv_install_distro_package_list: "{{ aodh_distro_packages }}"
|
||||
venv_pip_install_args: "{{ aodh_pip_install_args }}"
|
||||
venv_pip_packages: "{{ (aodh_oslomsg_amqp1_enabled | bool) | ternary(aodh_pip_packages + aodh_optional_oslomsg_amqp1_pip_packages, aodh_pip_packages) }}"
|
||||
venv_facts_when_changed:
|
||||
- section: "aodh"
|
||||
option: "venv_tag"
|
||||
value: "{{ aodh_venv_tag }}"
|
||||
|
||||
- name: Install optional pip packages
|
||||
pip:
|
||||
name: "{{ aodh_optional_oslomsg_amqp1_pip_packages }}"
|
||||
state: "{{ aodh_pip_package_state }}"
|
||||
virtualenv: "{{ aodh_bin | dirname }}"
|
||||
virtualenv_site_packages: "no"
|
||||
when: aodh_oslomsg_amqp1_enabled
|
||||
register: install_optional_packages
|
||||
until: install_optional_packages is success
|
||||
retries: 5
|
||||
delay: 2
|
||||
|
||||
- name: Record the venv tag deployed
|
||||
ini_file:
|
||||
dest: "/etc/ansible/facts.d/openstack_ansible.fact"
|
||||
section: aodh
|
||||
option: venv_tag
|
||||
value: "{{ aodh_venv_tag }}"
|
||||
|
|
Loading…
Reference in New Issue