From 1b4c92434db9a45d13ceb599bb66b4dd9a1f6a8f Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Sat, 5 Jan 2019 17:44:39 -0500 Subject: [PATCH] vars: stop placing neutron_developer_constraints in vars There is no specific reason for placing neutron_developer_constraints inside vars and it doesn't let the user override them if they want to use specific constraints (i.e. install from PyPI directly instead of installing from Git) Change-Id: I08f9b67c5bd8fc1c8c4e31449e9a107548cd08b0 --- defaults/main.yml | 12 ++++++++++++ vars/main.yml | 13 ------------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 264b28e7..50781ace 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -77,6 +77,18 @@ networking_ovn_git_install_branch: master # Developer mode neutron_developer_mode: false +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+{{ 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" # TODO(odyssey4me): # This can be simplified once all the roles are using diff --git a/vars/main.yml b/vars/main.yml index 9376263c..bd730ab7 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -79,19 +79,6 @@ neutron_proprietary_nuage_pip_packages: 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+{{ 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 ###