openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

vars: eliminate developer mode vars

Browse Source 
This patch eliminates variables related to developer mode as they
don't mean anything anymore with python_venv_build.

It merges the package that was there (git) with devel distro packages
variable.  We also remove it from `neutron_package_list` to make sure
we don't install it all the time.

Change-Id: Ie9e236e56dbdb98aacf16de0741584b1483e23c3
This commit is contained in:
Mohammed Naser 2019-03-28 09:15:23 -04:00
parent 01857d45c9
commit 58afefc8a8
6 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tasks/neutron_install.yml
View File

@ -51,6 +51,7 @@
name: "python_venv_build" name: "python_venv_build"
vars: vars:
venv_build_constraints: "{{ neutron_git_constraints }}" venv_build_constraints: "{{ neutron_git_constraints }}"
venv_build_distro_package_list: "{{ neutron_devel_distro_packages }}"
venv_install_destination_path: "{{ neutron_bin | dirname }}" venv_install_destination_path: "{{ neutron_bin | dirname }}"
venv_install_distro_package_list: "{{ neutron_package_list }}" venv_install_distro_package_list: "{{ neutron_package_list }}"
venv_pip_install_args: "{{ neutron_pip_install_args }}" venv_pip_install_args: "{{ neutron_pip_install_args }}"

3
vars/distro_install.yml
View File

@ -57,9 +57,6 @@ neutron_package_list: |-
{% if (neutron_services['neutron-ovn-controller']['group'] in group_names and (neutron_plugin_type == 'ml2.ovn') | bool) %} {% if (neutron_services['neutron-ovn-controller']['group'] in group_names and (neutron_plugin_type == 'ml2.ovn') | bool) %}
{% set _ = packages.extend(neutron_ovn_controller_distro_packages) %} {% set _ = packages.extend(neutron_ovn_controller_distro_packages) %}
{% endif %} {% endif %}
{% if neutron_developer_mode | bool %}
{% set _ = packages.extend(neutron_developer_mode_distro_packages) %}
{% endif %}
{% if neutron_oslomsg_amqp1_enabled | bool %} {% if neutron_oslomsg_amqp1_enabled | bool %}
{% set _ = packages.extend(neutron_oslomsg_amqp1_distro_packages) %} {% set _ = packages.extend(neutron_oslomsg_amqp1_distro_packages) %}
{% endif %} {% endif %}

4
vars/redhat-7.yml
View File

@ -48,6 +48,7 @@ neutron_ovn_northd_distro_packages:
- openvswitch-ovn-central - openvswitch-ovn-central
neutron_devel_distro_packages: neutron_devel_distro_packages:
- git
- python-httplib2 - python-httplib2
neutron_service_distro_packages: neutron_service_distro_packages:
@ -74,9 +75,6 @@ neutron_optional_lbaas_distro_packages:
neutron_optional_vpnaas_distro_packages: neutron_optional_vpnaas_distro_packages:
- openstack-neutron-vpnaas - openstack-neutron-vpnaas
neutron_developer_mode_distro_packages:
- git
neutron_lxb_distro_packages: neutron_lxb_distro_packages:
- bridge-utils - bridge-utils

4
vars/source_install.yml
View File

@ -53,13 +53,9 @@ neutron_package_list: |-
{% if (neutron_services['neutron-ovn-controller']['group'] in group_names and neutron_plugin_type == 'ml2.ovn') %} {% if (neutron_services['neutron-ovn-controller']['group'] in group_names and neutron_plugin_type == 'ml2.ovn') %}
{% set _ = packages.extend(neutron_ovn_controller_distro_packages) %} {% set _ = packages.extend(neutron_ovn_controller_distro_packages) %}
{% endif %} {% endif %}
{% if neutron_developer_mode | bool %}
{% set _ = packages.extend(neutron_developer_mode_distro_packages) %}
{% endif %}
{% if neutron_oslomsg_amqp1_enabled | bool %} {% if neutron_oslomsg_amqp1_enabled | bool %}
{% set _ = packages.extend(neutron_oslomsg_amqp1_distro_packages) %} {% set _ = packages.extend(neutron_oslomsg_amqp1_distro_packages) %}
{% endif %} {% endif %}
{% set _ = packages.extend(neutron_devel_distro_packages) %}
{{ packages }} {{ packages }}
neutron_bin: "/openstack/venvs/neutron-{{ neutron_venv_tag }}/bin" neutron_bin: "/openstack/venvs/neutron-{{ neutron_venv_tag }}/bin"

4
vars/suse.yml
View File

@ -64,6 +64,7 @@ neutron_ovn_northd_distro_packages:
- openvswitch-ovn-central - openvswitch-ovn-central
neutron_devel_distro_packages: neutron_devel_distro_packages:
- git-core
- python-httplib2 - python-httplib2
neutron_service_distro_packages: neutron_service_distro_packages:
@ -91,9 +92,6 @@ neutron_optional_lbaas_distro_packages:
neutron_option_vpnaas_distro_packages: neutron_option_vpnaas_distro_packages:
- openstack-neutron-vpnaas - openstack-neutron-vpnaas
neutron_developer_mode_distro_packages:
- git-core
neutron_lxb_distro_packages: neutron_lxb_distro_packages:
- bridge-utils - bridge-utils

4
vars/ubuntu.yml
View File

@ -61,6 +61,7 @@ neutron_ovn_northd_distro_packages:
- ovn-central - ovn-central
neutron_devel_distro_packages: neutron_devel_distro_packages:
- git-core
- python-httplib2 - python-httplib2
neutron_service_distro_packages: neutron_service_distro_packages:
@ -89,9 +90,6 @@ neutron_optional_lbaas_distro_packages:
neutron_optional_vpnaas_distro_packages: neutron_optional_vpnaas_distro_packages:
- neutron-vpnaas-agent - neutron-vpnaas-agent
neutron_developer_mode_distro_packages:
- git-core
neutron_lxb_distro_packages: neutron_lxb_distro_packages:
- bridge-utils - bridge-utils