Move source build vars back to vars/main

All other roles have their pip_packages in defaults/main.yml
and the lists were all in vars/main.yml before [1] was
implemented. Since then, the py_pkgs lookup does not recognise
that neutron has the project_group of 'neutron_all', but
instead thinks it is in 'all'. This mismatches the git
repo project group, resulting in a failed repo build if the
group is not populated. It also results in neutron packages
building even if neutron is not configured to be part of the
build.

This patch moves the vars back to vars/main.yml to restore
proper functioning of the repo build and correct association
with the project group.

These vars are not used by the distro install process, so it
does not matter where they're sourced.

[1] https://review.openstack.org/573661

Change-Id: If8aa2dba6fc5b09a71c93de7f048ea716fc6a2c1

vars/main.yml

@@ -27,6 +27,74 @@ neutron_needs_openvswitch: >-
 # Set the Calico Felix agent executable destination path
 calico_felix_bin: /usr/local/bin/calico-felix
 
+###
+### Python code details
+###
+
+neutron_pip_packages:
+  - cliff
+  - configobj
+  - cryptography
+  - keystonemiddleware
+  - neutron
+  - osprofiler
+  - PyMySQL
+  - python-glanceclient
+  - python-keystoneclient
+  - python-memcached
+  - python-neutronclient
+  - python-novaclient
+  - repoze.lru
+
+neutron_optional_bgp_pip_packages:
+  - neutron_dynamic_routing
+
+neutron_optional_calico_pip_packages:
+  - networking-calico
+  - python-etcd
+
+neutron_optional_fwaas_pip_packages:
+  - neutron_fwaas
+
+neutron_optional_lbaas_pip_packages:
+  - neutron_lbaas
+
+neutron_optional_vpnaas_pip_packages:
+  - neutron_vpnaas
+
+neutron_optional_dragonflow_pip_packages:
+  - dragonflow
+  - python-etcd
+
+neutron_optional_opendaylight_pip_packages:
+  - networking-odl
+  - networking-bgpvpn
+
+neutron_optional_opendaylight_sfc_pip_packages:
+  - networking-sfc
+
+neutron_proprietary_nuage_pip_packages:
+  - nuage-openstack-neutron
+  - nuage-openstack-neutronclient
+  - nuagenetlib
+
+neutron_optional_ovn_pip_packages:
+  - networking-ovn
+
+neutron_developer_constraints:
+  - "git+{{ neutron_git_repo }}@{{ neutron_git_install_branch }}#egg=neutron"
+  - "git+{{ neutron_fwaas_git_repo }}@{{ neutron_fwaas_git_install_branch }}#egg=neutron-fwaas"
+  - "git+{{ neutron_lbaas_git_repo }}@{{ neutron_lbaas_git_install_branch }}#egg=neutron-lbaas"
+  - "git+{{ neutron_vpnaas_git_repo }}@{{ neutron_vpnaas_git_install_branch }}#egg=neutron-vpnaas"
+  - "git+{{ neutron_dynamic_routing_git_repo }}@{{ neutron_dynamic_routing_git_install_branch }}#egg=neutron-dynamic-routing"
+  - "git+{{ networking_calico_git_repo }}@{{ networking_calico_git_install_branch }}#egg=networking-calico"
+  - "git+{{ dragonflow_git_repo }}@{{ dragonflow_git_install_branch }}#egg=dragonflow"
+  - "git+{{ networking_odl_git_repo }}@{{ networking_odl_git_install_branch }}#egg=networking-odl"
+  - "git+{{ networking_sfc_git_repo }}@{{ networking_sfc_git_install_branch }}#egg=networking-sfc"
+  - "git+{{ networking_bgpvpn_git_repo }}@{{ networking_bgpvpn_git_install_branch }}#egg=networking-bgpvpn"
+  - "git+{{ openstack_ceilometer_git_repo }}@{{ openstack_ceilometer_git_install_branch }}#egg=ceilometer"
+  - "git+{{ networking_ovn_git_repo }}@{{ networking_ovn_git_install_branch }}#egg=networking-ovn"
+
 ###
 ### Generic Neutron Config
 ###

vars/source_install.yml

@@ -59,70 +59,6 @@ neutron_package_list: |-
   {% set _ = packages.extend(neutron_devel_distro_packages) %}
   {{ packages }}
 
-neutron_pip_packages:
-  - cliff
-  - configobj
-  - cryptography
-  - keystonemiddleware
-  - osprofiler
-  - PyMySQL
-  - neutron
-  - python-glanceclient
-  - python-keystoneclient
-  - python-memcached
-  - python-neutronclient
-  - python-novaclient
-  - repoze.lru
-
-neutron_optional_bgp_pip_packages:
-  - neutron_dynamic_routing
-
-neutron_optional_calico_pip_packages:
-  - networking-calico
-  - python-etcd
-
-neutron_optional_fwaas_pip_packages:
-  - neutron_fwaas
-
-neutron_optional_lbaas_pip_packages:
-  - neutron_lbaas
-
-neutron_optional_vpnaas_pip_packages:
-  - neutron_vpnaas
-
-neutron_optional_dragonflow_pip_packages:
-  - dragonflow
-  - python-etcd
-
-neutron_optional_opendaylight_pip_packages:
-  - networking-odl
-  - networking-bgpvpn
-
-neutron_optional_opendaylight_sfc_pip_packages:
-  - networking-sfc
-
-neutron_proprietary_nuage_pip_packages:
-  - nuage-openstack-neutron
-  - nuage-openstack-neutronclient
-  - nuagenetlib
-
-neutron_optional_ovn_pip_packages:
-  - networking-ovn
-
-neutron_developer_constraints:
-  - "git+{{ neutron_git_repo }}@{{ neutron_git_install_branch }}#egg=neutron"
-  - "git+{{ neutron_fwaas_git_repo }}@{{ neutron_fwaas_git_install_branch }}#egg=neutron-fwaas"
-  - "git+{{ neutron_lbaas_git_repo }}@{{ neutron_lbaas_git_install_branch }}#egg=neutron-lbaas"
-  - "git+{{ neutron_vpnaas_git_repo }}@{{ neutron_vpnaas_git_install_branch }}#egg=neutron-vpnaas"
-  - "git+{{ neutron_dynamic_routing_git_repo }}@{{ neutron_dynamic_routing_git_install_branch }}#egg=neutron-dynamic-routing"
-  - "git+{{ networking_calico_git_repo }}@{{ networking_calico_git_install_branch }}#egg=networking-calico"
-  - "git+{{ dragonflow_git_repo }}@{{ dragonflow_git_install_branch }}#egg=dragonflow"
-  - "git+{{ networking_odl_git_repo }}@{{ networking_odl_git_install_branch }}#egg=networking-odl"
-  - "git+{{ networking_sfc_git_repo }}@{{ networking_sfc_git_install_branch }}#egg=networking-sfc"
-  - "git+{{ networking_bgpvpn_git_repo }}@{{ networking_bgpvpn_git_install_branch }}#egg=networking-bgpvpn"
-  - "git+{{ openstack_ceilometer_git_repo }}@{{ openstack_ceilometer_git_install_branch }}#egg=ceilometer"
-  - "git+{{ networking_ovn_git_repo }}@{{ networking_ovn_git_install_branch }}#egg=networking-ovn"
-
 neutron_bin: "/openstack/venvs/neutron-{{ neutron_venv_tag }}/bin"
 
 neutron_venv_download: "{{ not neutron_developer_mode | bool }}"