diff --git a/autogenerate_config_docs/autohelp-wrapper b/autogenerate_config_docs/autohelp-wrapper index 033a4abf..0ee82f4a 100755 --- a/autogenerate_config_docs/autohelp-wrapper +++ b/autogenerate_config_docs/autohelp-wrapper @@ -136,11 +136,12 @@ if [ "$FAST" -eq 0 ] ; then get_project oslo-incubator get_project openstack-manuals + release=$(echo $BRANCH | sed 's,^stable.,,') for project in $PROJECTS; do setup_venv $project setup_tools - if [ -e requirements/$project.txt ]; then - pip install -r requirements/$project.txt \ + if [ -e requirements/$project-$release.txt ]; then + pip install -r requirements/$project-$release.txt \ --allow-all-external fi get_project $project diff --git a/autogenerate_config_docs/diff_branches.py b/autogenerate_config_docs/diff_branches.py index 95170405..3a495969 100755 --- a/autogenerate_config_docs/diff_branches.py +++ b/autogenerate_config_docs/diff_branches.py @@ -65,7 +65,9 @@ def get_options(project, branch, args): # And run autohelp script to get a serialized dict of the discovered # options - dirname = os.path.abspath(os.path.join('venv', branch.replace('/', '_'))) + dirname = os.path.abspath(os.path.join('venv', + branch.replace('/', '_'), + project)) if project == 'swift': cmd = ("python extract_swift_flags.py dump " "-s %(sources)s/swift -m %(sources)s/openstack-manuals" % diff --git a/autogenerate_config_docs/hooks.py b/autogenerate_config_docs/hooks.py index bd56d0e8..25ed27d9 100644 --- a/autogenerate_config_docs/hooks.py +++ b/autogenerate_config_docs/hooks.py @@ -36,17 +36,21 @@ def glance_store_config(): def neutron_misc(): - import bsnstacklib.plugins.bigswitch.config - import networking_cisco.plugins.cisco.cfg_agent.device_status # noqa - import networking_l2gw.services.l2gateway.common.config as l2gw - import networking_vsphere.common.config - from oslo_config import cfg - import vmware_nsx.neutron.plugins.vmware.common.config # noqa + try: + # These imports are needed for kilo only + import bsnstacklib.plugins.bigswitch.config + import networking_cisco.plugins.cisco.cfg_agent.device_status # noqa + import networking_l2gw.services.l2gateway.common.config as l2gw + import networking_vsphere.common.config + from oslo_config import cfg + import vmware_nsx.neutron.plugins.vmware.common.config # noqa - bsnstacklib.plugins.bigswitch.config.register_config() - networking_vsphere.common.config.register_options() - l2gw.register_l2gw_opts_helper() - l2gw.register_ovsdb_opts_helper(cfg.CONF) + bsnstacklib.plugins.bigswitch.config.register_config() + networking_vsphere.common.config.register_options() + l2gw.register_l2gw_opts_helper() + l2gw.register_ovsdb_opts_helper(cfg.CONF) + except Exception: + pass def nova_spice(): diff --git a/autogenerate_config_docs/requirements/cinder.txt b/autogenerate_config_docs/requirements/cinder-juno.txt similarity index 100% rename from autogenerate_config_docs/requirements/cinder.txt rename to autogenerate_config_docs/requirements/cinder-juno.txt diff --git a/autogenerate_config_docs/requirements/neutron-juno.txt b/autogenerate_config_docs/requirements/neutron-juno.txt new file mode 100644 index 00000000..8f7e407e --- /dev/null +++ b/autogenerate_config_docs/requirements/neutron-juno.txt @@ -0,0 +1 @@ +ryu diff --git a/autogenerate_config_docs/requirements/neutron-kilo.txt b/autogenerate_config_docs/requirements/neutron-kilo.txt new file mode 100644 index 00000000..ac0385a8 --- /dev/null +++ b/autogenerate_config_docs/requirements/neutron-kilo.txt @@ -0,0 +1,34 @@ +ryu +# for vmware +-e git://git.openstack.org/openstack/nova.git@stable/kilo#egg=nova + +# for a bunch of plugins +-e git://git.openstack.org/openstack/neutron.git@stable/kilo#egg=neutron +-e git://git.openstack.org/openstack/neutron-lbaas.git@stable/kilo#egg=neutron-lbaas + +# for midonet +-e git://github.com/midonet/python-midonetclient.git#egg=midonetclient + +-e git+https://git.openstack.org/stackforge/networking-arista.git@stable/kilo#egg=networking-arista +-e git+https://git.openstack.org/stackforge/networking-bagpipe-l2.git@master#egg=networking-bagpipe-l2 +-e git+https://git.openstack.org/stackforge/networking-bgpvpn.git@master#egg=networking-bgpvpn +-e git+https://git.openstack.org/stackforge/networking-bigswitch.git@master#egg=networking-bigswitch +-e git+https://git.openstack.org/stackforge/networking-brocade.git@master#egg=networking-brocade +-e git+https://git.openstack.org/stackforge/networking-cisco.git@stable/kilo#egg=networking-cisco +-e git+https://git.openstack.org/stackforge/networking-edge-vpn.git@master#egg=networking-edge-vpn +-e git+https://git.openstack.org/stackforge/networking-hyperv.git@master#egg=networking-hyperv +-e git+https://git.openstack.org/stackforge/networking-ibm.git@master#egg=networking-ibm +-e git+https://git.openstack.org/stackforge/networking-l2gw.git@master#egg=networking-l2gw +# pip dependency installation failure +-e git+https://git.openstack.org/stackforge/networking-midonet.git@master#egg=networking-midonet +-e git+https://git.openstack.org/stackforge/networking-mlnx.git@master#egg=networking-mlnx +-e git+https://git.openstack.org/stackforge/networking-nec.git@stable/kilo#egg=networking-nec +-e git+https://git.openstack.org/stackforge/networking-odl.git@master#egg=networking-odl +-e git+https://git.openstack.org/stackforge/networking-ofagent.git@master#egg=networking-ofagent +-e git+https://git.openstack.org/stackforge/networking-ovn.git@master#egg=networking-ovn +-e git+https://git.openstack.org/stackforge/networking-ovs-dpdk.git@stable/kilo#egg=networking-ovs-dpdk +-e git+https://git.openstack.org/stackforge/networking-plumgrid.git@master#egg=networking-plumgrid +-e git+https://git.openstack.org/stackforge/networking-portforwarding.git@master#egg=networking-portforwarding +-e git+https://git.openstack.org/stackforge/networking-vsphere.git@master#egg=networking-vsphere +-e git+https://git.openstack.org/stackforge/neutron-powervm.git@master#egg=neutron-powervm +-e git+https://git.openstack.org/stackforge/vmware-nsx.git#egg=vmware-nsx diff --git a/autogenerate_config_docs/requirements/neutron.txt b/autogenerate_config_docs/requirements/neutron-master.txt similarity index 100% rename from autogenerate_config_docs/requirements/neutron.txt rename to autogenerate_config_docs/requirements/neutron-master.txt