openstack/aodh
Code Issues Proposed changes

Merge "Fix aodh-config-generator"

Browse Source
This commit is contained in:
Jenkins 2017-07-12 06:28:40 +00:00 committed by Gerrit Code Review
commit 1a249df13d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
aodh/cmd/__init__.py
View File

@ -14,15 +14,16 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import os import os
import sys
def config_generator(): def config_generator():
args = ['--output-file', 'etc/aodh/aodh.conf']
try: try:
from oslo_config import generator from oslo_config import generator
generator.main( generator.main(
['--config-file', ['--config-file',
'%s/aodh-config-generator.conf' % os.path.dirname(__file__)] '%s/aodh-config-generator.conf' % os.path.dirname(__file__)]
+ args) + sys.argv[1:])
except Exception as e: except Exception as e:
print("Unable to build sample configuration file: %s" % e) print("Unable to build sample configuration file: %s" % e)
return 1

1
aodh/aodh-config-generator.conf → aodh/cmd/aodh-config-generator.conf
View File

@ -1,5 +1,4 @@
[DEFAULT] [DEFAULT]
output_file = etc/aodh/aodh.conf
wrap_width = 79 wrap_width = 79
namespace = aodh namespace = aodh
namespace = aodh-auth namespace = aodh-auth

2
doc/source/conf.py
View File

@ -52,7 +52,7 @@ extensions = [
] ]
config_generator_config_file = os.path.join(ROOT, config_generator_config_file = os.path.join(ROOT,
'aodh/aodh-config-generator.conf') 'aodh/cmd/aodh-config-generator.conf')
sample_config_basename = '_static/aodh' sample_config_basename = '_static/aodh'
wsme_protocols = ['restjson', 'restxml'] wsme_protocols = ['restjson', 'restxml']