Cleanup openstack-common.conf and sync from olso

An upcoming change[1] in oslo's update.py adds new warnings for
style issues in the config. To compensate this commit:

 - orders the modules alphabetically
 - uses the script directive for scripts

Sync with oslo-incubator caed79d

This syncs Keystone with oslo-incubator commit hash
caed79d8239679cb74476bb0d9e5011b4fcc39da.

In keystone:

$ rm -r keystone/openstack/common

In oslo-incubator:

$ python update.py ../keystone

Commits
-------

1173e46 Remove ValueError when accessing sys.modules
17c4e21 Fix docstring indentation in systemd
90ae24b Remove redundant default=None for config options
6c7407b fileutils: port to Python 3
18f2bc1 Enforce unicode json output for jsonutils.load[s]()
af36c2a Fix logging setup for Python 3.4
5ae792b Document config generator variables
ea9ead8 Allow file exclusion in config generator
cdcc19c Mask passwords that are included in commands
9e5a393 jsonutils.load() accepts file pointer, not string
a6b2aec On Python <= 2.6, use simplejson if available
fe3389e Improve help strings
8a0f567 Remove str() from LOG.* and exceptions
f3f14c9 Fixed several typos
0f495ee Emit a log statement when releasing internal lock
9912e5d Add API for creating translation functions

1. https://review.openstack.org/76901

Change-Id: I89de9ae9e3c574095967a2a67e842a90b5527ffa

2 files changed, 15 insertions, 1 deletions

diff --git a/tools/config/generate_sample.sh b/tools/config/generate_sample.sh
index 73fe0e3b5..a09ee8254 100755
--- a/tools/config/generate_sample.sh
+++ b/tools/config/generate_sample.sh
@@ -1,5 +1,15 @@
 #!/usr/bin/env bash
 
+# Generate sample configuration for your project.
+#
+# Aside from the command line flags, it also respects a config file which
+# should be named oslo.config.generator.rc and be placed in the same directory.
+#
+# You can then export the following variables:
+# KEYSTONE_CONFIG_GENERATOR_EXTRA_MODULES: list of modules to interrogate for options.
+# KEYSTONE_CONFIG_GENERATOR_EXTRA_LIBRARIES: list of libraries to discover.
+# KEYSTONE_CONFIG_GENERATOR_EXCLUDED_FILES: list of files to remove from automatic listing.
+
 print_hint() {
     echo "Try \`${0##*/} --help' for more information." >&2
 }
@@ -95,6 +105,10 @@ then
     source "$RC_FILE"
 fi
 
+for filename in ${KEYSTONE_CONFIG_GENERATOR_EXCLUDED_FILES}; do
+    FILES="${FILES[@]/$filename/}"
+done
+
 for mod in ${KEYSTONE_CONFIG_GENERATOR_EXTRA_MODULES}; do
     MODULES="$MODULES -m $mod"
 done
diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py
index 46822e329..e279159ab 100644
--- a/tools/install_venv_common.py
+++ b/tools/install_venv_common.py
@@ -125,7 +125,7 @@ class InstallVenv(object):
         parser.add_option('-n', '--no-site-packages',
                           action='store_true',
                           help="Do not inherit packages from global Python "
-                               "install")
+                               "install.")
         return parser.parse_args(argv[1:])[0]