diff --git a/autogenerate_config_docs/autohelp-wrapper b/autogenerate_config_docs/autohelp-wrapper index c5804dd5..633c7311 100755 --- a/autogenerate_config_docs/autohelp-wrapper +++ b/autogenerate_config_docs/autohelp-wrapper @@ -21,6 +21,7 @@ AUTOHELP="python $HERE/autohelp.py" EXTRACT_SWIFT="python $HERE/extract_swift_flags.py" GITBASE=git://git.openstack.org/openstack GITPROJ=git://git.openstack.org/openstack +GITSTACKPROJ=git://git.openstack.org/stackforge PROJECTS="ceilometer cinder glance heat ironic keystone neutron nova sahara swift trove" MANUALS_PROJECTS="openstack-manuals oslo-incubator" BRANCH=master @@ -68,6 +69,7 @@ activate_venv() { get_project() { project=$1 git_url=$GITPROJ + git_url_stackforge=$GITSTACKPROJ if [ ! -e $SOURCESDIR/$project ]; then if [[ $MANUALS_PROJECTS =~ (^| )$project($| ) ]]; then @@ -81,6 +83,12 @@ get_project() { done < extra_repos/$project-$RELEASE fi + if [ -e extra_repos/$project-$RELEASE-stackforge ]; then + while read extra; do + git clone $git_url_stackforge/$extra $SOURCESDIR/$extra + done < extra_repos/$project-$RELEASE-stackforge + fi + else if [ $project != openstack-manuals ]; then (cd $SOURCESDIR/$project && git pull) @@ -205,10 +213,32 @@ for project in $PROJECTS; do extra_flags= while read extra; do package=$(echo $extra | tr - _) + if [ $package = "networking_midonet" ]; then + package="midonet" + fi extra_flags="$extra_flags -i $SOURCESDIR/$extra/$package" done < extra_repos/$project-$RELEASE fi + if [ -e extra_repos/$project-$RELEASE-stackforge ]; then + while read extra; do + package=$(echo $extra | tr - _) + if [ $package = "networking_hyperv" ]; then + package="hyperv" + fi + if [ $package = "networking_bigswitch" ]; then + package="bsnstacklib" + fi + if [ $package = "networking_edge_vpn" ]; then + package="networking-edge-vpn" + fi + if [ $package = "networking_zvm" ]; then + package="neutron" + fi + extra_flags="$extra_flags -i $SOURCESDIR/$extra/$package" + done < extra_repos/$project-$RELEASE-stackforge + fi + cd $MANUALSREPO/tools/autogenerate-config-flagmappings case $ACTION in diff --git a/autogenerate_config_docs/extra_repos/neutron-master b/autogenerate_config_docs/extra_repos/neutron-master index 38a2ceb4..07e0b1c2 100644 --- a/autogenerate_config_docs/extra_repos/neutron-master +++ b/autogenerate_config_docs/extra_repos/neutron-master @@ -1,3 +1,21 @@ neutron-fwaas neutron-lbaas neutron-vpnaas +networking-arista +networking-bgpvpn +networking-cisco +networking-l2gw +networking-sfc +networking-infoblox +networking-fujitsu +networking-onos +networking-calico +networking-ale-omniswitch +networking-midonet +networking-odl +networking-ofagent +networking-ovn +networking-plumgrid +networking-vsphere +networking-powervm +vmware-nsx diff --git a/autogenerate_config_docs/extra_repos/neutron-master-stackforge b/autogenerate_config_docs/extra_repos/neutron-master-stackforge new file mode 100644 index 00000000..48395eb6 --- /dev/null +++ b/autogenerate_config_docs/extra_repos/neutron-master-stackforge @@ -0,0 +1,11 @@ +networking-bagpipe-l2 +networking-bigswitch +networking-brocade +networking-edge-vpn +networking-hyperv +networking-ibm +networking-mlnx +networking-nec +networking-ovs-dpdk +networking-zvm +networking-6wind