openstack
/
openstack-doc-tools
Code Issues Proposed changes

use environment variables for GITPROJ and GITBASE 

Companies may have VPN, and in China, there is a firewall named
G.F.W., they both may block some protocols or ports, so if I run
autohelp-wrapper, it will fail like this:

/opt/stack/openstack-doc-tools/autogenerate_config_docs$ ./autohelp-wrapper update ceilometer
Cloning into '/opt/stack/openstack-doc-tools/autogenerate_config_docs/sources/openstack-manuals'...
fatal: unable to connect to git.openstack.org:
git.openstack.org[0: 104.130.246.128]: errno=Connection timed out
git.openstack.org[1: 2001:4800:7819:103:be76:4eff:fe06:63c]: errno=Network is unreachable

Now we have -g option, which can set GITPROJ, but GITBASE still
use git://git.openstack.org/openstack, so it still fail:

/opt/stack/openstack-doc-tools/autogenerate_config_docs$ ./autohelp-wrapper -g https://github.com/openstack update ceilometer

Here I proposal to use environment variable value for GITPROJ and
GITBASE if they exist, so some devs, like me, can get rid of
hacking autohelp-wrapper to work then restore it when commit.

Change-Id: If7dc3ebe398c71d6461a5983d4aab1bc87984697
Closes-Bug: #1574224
This commit is contained in:
ZhiQiang Fan 2016-04-25 03:03:18 +08:00
parent 22201b96bf
commit 1b9920beed
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autogenerate_config_docs/autohelp-wrapper
View File

@ -20,8 +20,8 @@ MANUALSREPO=$SOURCESDIR/openstack-manuals
MAPPINGS_DIR=$MANUALSREPO/tools/autogenerate-config-flagmappings
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
GITBASE=${GITBASE:-git://git.openstack.org/openstack}
GITPROJ=${GITPROJ:-git://git.openstack.org/openstack}
PROJECTS="aodh ceilometer cinder glance heat ironic keystone manila \
neutron nova sahara swift trove zaqar"
MANUALS_PROJECTS="openstack-manuals"