Update role for new source build process
The variables aodh_developer_mode and aodh_venv_download no longer carry any meaning. This review changes glance to do the equivalent of what developer_mode was all the time, meaning that it always builds the venv and never requires the repo server, but it will use a repo server when available. As part of this, we move the source build out of its own file because it's now a single task to include the venv build role. This is just to make it easier to follow the code. Change-Id: I04e119c1404d8681ef7e5d964c95fbeb8970756b
This commit is contained in:
Mohammed Naser
parent
e510abdbc0
commit
fa5c2dad78
|
|
@ -30,39 +30,20 @@ aodh_pip_package_state: "latest"
|
|||
# Set installation method.
|
||||
aodh_install_method: "source"
|
||||
|
||||
## Toggle developer mode
|
||||
aodh_developer_mode: false
|
||||
|
||||
## The git source/branch
|
||||
aodh_git_repo: https://git.openstack.org/openstack/aodh
|
||||
aodh_git_install_branch: master
|
||||
|
||||
## The packages to build from source (used in developer mode)
|
||||
aodh_developer_constraints:
|
||||
aodh_upper_constraints_url: "{{ requirements_git_url | default('https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=' ~ requirements_git_install_branch | default('master')) }}"
|
||||
aodh_git_constraints:
|
||||
- "git+{{ aodh_git_repo }}@{{ aodh_git_install_branch }}#egg=aodh"
|
||||
- "--constraint {{ aodh_upper_constraints_url }}"
|
||||
|
||||
# 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('') }}
|
||||
|
||||
aodh_pip_install_args: "{{ pip_install_options | default('') }}"
|
||||
|
||||
# Name of the virtual env to deploy into
|
||||
aodh_venv_tag: "{{ venv_tag | default('untagged') }}"
|
||||
aodh_bin: "{{ _aodh_bin }}"
|
||||
|
||||
# venv_download, even when true, will use the fallback method of building the
|
||||
# venv from scratch if the venv download fails.
|
||||
aodh_venv_download: "{{ not aodh_developer_mode | bool }}"
|
||||
# URL of the pre-built virtualenv
|
||||
aodh_venv_download_url: http://127.0.0.1/venvs/untagged/ubuntu/aodh.tgz
|
||||
|
||||
## System info
|
||||
aodh_system_user_name: aodh
|
||||
aodh_system_group_name: aodh
|
||||
|
|
@ -160,6 +141,7 @@ aodh_pip_packages:
|
|||
- sqlalchemy-utils
|
||||
- systemd-python
|
||||
- warlock
|
||||
aodh_user_pip_packages: []
|
||||
|
||||
aodh_optional_oslomsg_amqp1_pip_packages:
|
||||
- oslo.messaging[amqp1]
|
||||
|
|
|
|||
|
|
@ -48,6 +48,20 @@
|
|||
delay: 2
|
||||
when: install_test_packages|bool
|
||||
|
||||
- name: Install aodh packages from PIP
|
||||
include_tasks: aodh_install_source.yml
|
||||
- name: Install the python venv
|
||||
import_role:
|
||||
name: "python_venv_build"
|
||||
vars:
|
||||
venv_build_constraints: "{{ aodh_git_constraints }}"
|
||||
venv_build_distro_package_list: "{{ aodh_devel_distro_packages }}"
|
||||
venv_install_destination_path: "{{ aodh_bin | dirname }}"
|
||||
venv_pip_install_args: "{{ aodh_pip_install_args }}"
|
||||
venv_pip_packages: >-
|
||||
{{ aodh_pip_packages |
|
||||
union(aodh_user_pip_packages) |
|
||||
union(((aodh_oslomsg_amqp1_enabled | bool) | ternary(aodh_optional_oslomsg_amqp1_pip_packages, []))) }}
|
||||
venv_facts_when_changed:
|
||||
- section: "aodh"
|
||||
option: "venv_tag"
|
||||
value: "{{ aodh_venv_tag }}"
|
||||
when: aodh_install_method == 'source'
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
---
|
||||
# Copyright 2018, SUSE Linux GmbH.
|
||||
#
|
||||
# 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.
|
||||
|
||||
# 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 aodh_developer_constraints %}
|
||||
{{ item }}
|
||||
{% endfor %}
|
||||
when: aodh_developer_mode | bool
|
||||
|
||||
- name: Ensure remote wheel building is disabled in developer mode
|
||||
set_fact:
|
||||
venv_build_host: "{{ inventory_hostname }}"
|
||||
when:
|
||||
- aodh_developer_mode | bool
|
||||
|
||||
- name: Install the python venv
|
||||
include_role:
|
||||
name: "python_venv_build"
|
||||
vars:
|
||||
venv_build_distro_package_list: "{{ aodh_devel_distro_packages }}"
|
||||
venv_install_destination_path: "{{ aodh_bin | dirname }}"
|
||||
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 }}"
|
||||
Loading…
Reference in New Issue