Merge "Add neutron plugin modules for Config Reference autogen"

This commit is contained in:
Jenkins 2015-10-14 06:13:50 +00:00 committed by Gerrit Code Review
commit 10aacc6bce
3 changed files with 59 additions and 0 deletions

View File

@ -21,6 +21,7 @@ AUTOHELP="python $HERE/autohelp.py"
EXTRACT_SWIFT="python $HERE/extract_swift_flags.py" EXTRACT_SWIFT="python $HERE/extract_swift_flags.py"
GITBASE=git://git.openstack.org/openstack GITBASE=git://git.openstack.org/openstack
GITPROJ=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" PROJECTS="ceilometer cinder glance heat ironic keystone neutron nova sahara swift trove"
MANUALS_PROJECTS="openstack-manuals oslo-incubator" MANUALS_PROJECTS="openstack-manuals oslo-incubator"
BRANCH=master BRANCH=master
@ -68,6 +69,7 @@ activate_venv() {
get_project() { get_project() {
project=$1 project=$1
git_url=$GITPROJ git_url=$GITPROJ
git_url_stackforge=$GITSTACKPROJ
if [ ! -e $SOURCESDIR/$project ]; then if [ ! -e $SOURCESDIR/$project ]; then
if [[ $MANUALS_PROJECTS =~ (^| )$project($| ) ]]; then if [[ $MANUALS_PROJECTS =~ (^| )$project($| ) ]]; then
@ -81,6 +83,12 @@ get_project() {
done < extra_repos/$project-$RELEASE done < extra_repos/$project-$RELEASE
fi 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 else
if [ $project != openstack-manuals ]; then if [ $project != openstack-manuals ]; then
(cd $SOURCESDIR/$project && git pull) (cd $SOURCESDIR/$project && git pull)
@ -205,10 +213,32 @@ for project in $PROJECTS; do
extra_flags= extra_flags=
while read extra; do while read extra; do
package=$(echo $extra | tr - _) package=$(echo $extra | tr - _)
if [ $package = "networking_midonet" ]; then
package="midonet"
fi
extra_flags="$extra_flags -i $SOURCESDIR/$extra/$package" extra_flags="$extra_flags -i $SOURCESDIR/$extra/$package"
done < extra_repos/$project-$RELEASE done < extra_repos/$project-$RELEASE
fi 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 cd $MANUALSREPO/tools/autogenerate-config-flagmappings
case $ACTION in case $ACTION in

View File

@ -1,3 +1,21 @@
neutron-fwaas neutron-fwaas
neutron-lbaas neutron-lbaas
neutron-vpnaas 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

View File

@ -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