From 58afefc8a8faaa198b75ce72be255b904bff2bc9 Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Thu, 28 Mar 2019 09:15:23 -0400
Subject: [PATCH] vars: eliminate developer mode vars

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
---
 tasks/neutron_install.yml | 1 +
 vars/distro_install.yml   | 3 ---
 vars/redhat-7.yml         | 4 +---
 vars/source_install.yml   | 4 ----
 vars/suse.yml             | 4 +---
 vars/ubuntu.yml           | 4 +---
 6 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/tasks/neutron_install.yml b/tasks/neutron_install.yml
index 0e20f5c2..df8edf0c 100644
--- a/tasks/neutron_install.yml
+++ b/tasks/neutron_install.yml
@@ -51,6 +51,7 @@
     name: "python_venv_build"
   vars:
     venv_build_constraints: "{{ neutron_git_constraints }}"
+    venv_build_distro_package_list: "{{ neutron_devel_distro_packages }}"
     venv_install_destination_path: "{{ neutron_bin | dirname }}"
     venv_install_distro_package_list: "{{ neutron_package_list }}"
     venv_pip_install_args: "{{ neutron_pip_install_args }}"
diff --git a/vars/distro_install.yml b/vars/distro_install.yml
index 3078c273..3e68a05a 100644
--- a/vars/distro_install.yml
+++ b/vars/distro_install.yml
@@ -57,9 +57,6 @@ neutron_package_list: |-
   {% 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) %}
   {% endif %}
-  {% if neutron_developer_mode | bool %}
-  {%   set _ = packages.extend(neutron_developer_mode_distro_packages) %}
-  {% endif %}
   {% if neutron_oslomsg_amqp1_enabled | bool %}
   {%   set _ = packages.extend(neutron_oslomsg_amqp1_distro_packages) %}
   {% endif %}
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index 2ceace2c..6927e66a 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -48,6 +48,7 @@ neutron_ovn_northd_distro_packages:
   - openvswitch-ovn-central
 
 neutron_devel_distro_packages:
+  - git
   - python-httplib2
 
 neutron_service_distro_packages:
@@ -74,9 +75,6 @@ neutron_optional_lbaas_distro_packages:
 neutron_optional_vpnaas_distro_packages:
   - openstack-neutron-vpnaas
 
-neutron_developer_mode_distro_packages:
-  - git
-
 neutron_lxb_distro_packages:
   - bridge-utils
 
diff --git a/vars/source_install.yml b/vars/source_install.yml
index 8ff920e2..805ac366 100644
--- a/vars/source_install.yml
+++ b/vars/source_install.yml
@@ -53,13 +53,9 @@ neutron_package_list: |-
   {% if (neutron_services['neutron-ovn-controller']['group'] in group_names and neutron_plugin_type == 'ml2.ovn') %}
   {% set _ = packages.extend(neutron_ovn_controller_distro_packages) %}
   {% endif %}
-  {% if neutron_developer_mode | bool %}
-  {% set _ = packages.extend(neutron_developer_mode_distro_packages) %}
-  {% endif %}
   {% if neutron_oslomsg_amqp1_enabled | bool %}
   {%   set _ = packages.extend(neutron_oslomsg_amqp1_distro_packages) %}
   {% endif %}
-  {% set _ = packages.extend(neutron_devel_distro_packages) %}
   {{ packages }}
 
 neutron_bin: "/openstack/venvs/neutron-{{ neutron_venv_tag }}/bin"
diff --git a/vars/suse.yml b/vars/suse.yml
index b6f1244a..b403afdd 100644
--- a/vars/suse.yml
+++ b/vars/suse.yml
@@ -64,6 +64,7 @@ neutron_ovn_northd_distro_packages:
   - openvswitch-ovn-central
 
 neutron_devel_distro_packages:
+  - git-core
   - python-httplib2
 
 neutron_service_distro_packages:
@@ -91,9 +92,6 @@ neutron_optional_lbaas_distro_packages:
 neutron_option_vpnaas_distro_packages:
   - openstack-neutron-vpnaas
 
-neutron_developer_mode_distro_packages:
-  - git-core
-
 neutron_lxb_distro_packages:
   - bridge-utils
 
diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml
index 0821eb1f..1406fe05 100644
--- a/vars/ubuntu.yml
+++ b/vars/ubuntu.yml
@@ -61,6 +61,7 @@ neutron_ovn_northd_distro_packages:
   - ovn-central
 
 neutron_devel_distro_packages:
+  - git-core
   - python-httplib2
 
 neutron_service_distro_packages:
@@ -89,9 +90,6 @@ neutron_optional_lbaas_distro_packages:
 neutron_optional_vpnaas_distro_packages:
   - neutron-vpnaas-agent
 
-neutron_developer_mode_distro_packages:
-  - git-core
-
 neutron_lxb_distro_packages:
   - bridge-utils