diff --git a/defaults/main.yml b/defaults/main.yml index 2a7d50f..d7b7b62 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -53,8 +53,19 @@ monasca_developer_constraints: - "git+{{ monasca_persister_git_repo }}@{{ monasca_persister_git_install_branch }}#egg=monasca-persister" - "git+{{ monasca_python_client_git_repo }}@{{ monasca_python_client_git_install_branch }}#egg=python-monascaclient" +# 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. +monasca_pip_install_args: >- + {{ monasca_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 -monasca_venv_tag: untagged +monasca_venv_tag: "{{ venv_tag | default('untagged') }}" monasca_bin: "/openstack/venvs/monasca-{{ monasca_venv_tag }}/bin" monasca_etc_dir: "{{ monasca_bin | dirname }}/etc/monasca" diff --git a/handlers/main.yml b/handlers/main.yml index 328af33..cf199ca 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -44,3 +44,5 @@ daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}" with_dict: "{{ monasca_services }}" when: inventory_hostname in groups[item.value.group] + listen: + - "venv changed" diff --git a/tasks/monasca_install.yml b/tasks/monasca_install.yml index b1930bd..1339166 100644 --- a/tasks/monasca_install.yml +++ b/tasks/monasca_install.yml @@ -16,17 +16,12 @@ # (c) 2016 Donovan Francesco # (c) 2016 Paul Stevens -- name: Install distro packages - package: - name: "{{ monasca_distro_packages }}" - state: "{{ monasca_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" @@ -37,85 +32,22 @@ when: - monasca_developer_mode | bool -- name: Retrieve checksum for venv download - uri: - url: "{{ monasca_venv_download_url | replace('tgz', 'checksum') }}" - return_content: yes - register: monasca_venv_checksum - when: monasca_venv_download | bool - -- name: Attempt venv download - get_url: - url: "{{ monasca_venv_download_url }}" - dest: "/var/cache/{{ monasca_venv_download_url | basename }}" - checksum: "sha1:{{ monasca_venv_checksum.content | trim }}" - register: monasca_get_venv - when: monasca_venv_download | bool - -- name: Remove existing venv - file: - path: "{{ monasca_bin | dirname }}" - state: absent - when: monasca_get_venv is changed - -- name: Create monasca venv dir - file: - path: "{{ monasca_bin | dirname }}" - state: directory - register: monasca_venv_dir - when: monasca_get_venv is changed - -- name: Unarchive pre-built venv - unarchive: - src: "/var/cache/{{ monasca_venv_download_url | basename }}" - dest: "{{ monasca_bin | dirname }}" - copy: "no" - when: monasca_get_venv is changed - notify: - - Restart monasca services - -- name: Install pip packages - pip: - name: "{{ monasca_pip_packages }}" - state: "{{ monasca_pip_package_state }}" - virtualenv: "{{ monasca_bin | dirname }}" - virtualenv_site_packages: "no" - extra_args: >- - {{ monasca_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: monasca_get_venv | failed or monasca_get_venv | skipped - notify: - - Restart monasca services - -- name: CentOS remove python from path first - file: - path: "{{ monasca_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' - - monasca_get_venv is changed + - monasca_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 {{ monasca_bin }} -name \*.pyc -delete - sed -si '1s/^.*python.*$/#!{{ monasca_bin | replace ('/','\/') }}\/python/' {{ monasca_bin }}/* - virtualenv {{ monasca_bin | dirname }} \ - {{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \ - --no-pip \ - --no-setuptools \ - --no-wheel - when: monasca_get_venv is changed - tags: - - skip_ansible_lint +- name: Install the python venv + include_role: + name: "python_venv_build" + private: yes + vars: + venv_install_destination_path: "{{ monasca_bin | dirname }}" + venv_install_distro_package_list: "{{ monasca_distro_packages }}" + venv_pip_install_args: "{{ monasca_pip_install_args }}" + venv_pip_packages: "{{ monasca_pip_packages }}" + venv_facts_when_changed: + - section: "monasca" + option: "venv_tag" + value: "{{ monasca_venv_tag }}"