From ca45d5117c14dab7b150c4f8b5903e4704ae5fda Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Thu, 11 Apr 2019 14:22:49 +0100 Subject: [PATCH] Fix designate venv build constraints These were missing entirely from the venv build, and typo in defaults. Change-Id: Icc254aedb41b4090500c20103383681a17852171 --- defaults/main.yml | 2 +- tasks/designate_install.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index e4afcef..ea65461 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -39,7 +39,7 @@ designate_git_install_branch: master designate_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')) }}" designate_git_constraints: - "git+{{ designate_git_repo }}@{{ designate_git_install_branch }}#egg=designate" - - "--constraint {{ barbican_upper_constraints_url }}" + - "--constraint {{ designate_upper_constraints_url }}" designate_pip_install_args: "{{ pip_install_options | default('') }}" diff --git a/tasks/designate_install.yml b/tasks/designate_install.yml index f275e01..9596819 100644 --- a/tasks/designate_install.yml +++ b/tasks/designate_install.yml @@ -40,6 +40,7 @@ include_role: name: "python_venv_build" vars: + venv_build_constraints: "{{ designate_git_constraints }}" venv_build_distro_package_list: "{{ designate_devel_distro_packages }}" venv_install_destination_path: "{{ designate_bin | dirname }}" venv_pip_install_args: "{{ designate_pip_install_args }}"