Make venv download configurable

The neutron venv download configuration is set in vars/ instead of
defaults/ which is completely inconsistent from the nova role. This
implementation is suboptimal because it disallows configuration of
the venv download flag in group vars.

This update will make the neutron venv download vars consistent
with the nova configuration.

Change-Id: I1c2516fb2c95a8253271eaf626ccc923b2ee0846
This commit is contained in:
Logan V 2019-06-06 09:22:10 -06:00
parent f6e7d93d69
commit f135d659b6
3 changed files with 4 additions and 4 deletions

View File

@ -80,9 +80,11 @@ neutron_developer_mode: false
# Name of the virtual env to deploy into
neutron_venv_tag: untagged
neutron_bin: "{{ _neutron_bin }}"
# venv_download, even when true, will use the fallback method of building the
# venv from scratch if the venv download fails.
neutron_venv_download: "{{ not neutron_developer_mode | bool }}"
neutron_venv_download_url: http://127.0.0.1/venvs/untagged/ubuntu/neutron.tgz
###

View File

@ -56,4 +56,4 @@ neutron_package_list: |-
{% set _ = packages.extend(neutron_service_distro_packages) %}
{{ packages }}
neutron_bin: "/usr/bin"
_neutron_bin: "/usr/bin"

View File

@ -52,6 +52,4 @@ neutron_package_list: |-
{% set _ = packages.extend(neutron_devel_distro_packages) %}
{{ packages }}
neutron_bin: "/openstack/venvs/neutron-{{ neutron_venv_tag }}/bin"
neutron_venv_download: "{{ not neutron_developer_mode | bool }}"
_neutron_bin: "/openstack/venvs/neutron-{{ neutron_venv_tag }}/bin"