ea6954f72f
Change Idb7780f55e4a1fd77dd76becbf67c1ccbf220db7 restructured the python inventory generation code so that it would be possible to install it with pip. This change removes (most) of the import path hacks and switches to using a pip-installed version of osa_toolkit. Of note, the path hacks are left in place for the dynamic_inventory.py file for now, as that file is really more of an endpoint, but is tested. Also, the bootstrap-ansible.sh script was modified to install the code; this is unnecessary with the tox environments because the tox directive 'usedevelop=True' does that already. Production environments still need this, though. Finally, to maintain usability when called directly, the interpreter for dynamic_inventory.py was updated from `/usr/bin/env` to `/opt/ansible-runime/python`. This change ensures that in a full deployment the user is using the exact same code paths whether Ansible invokes the script, or it is called directly. This also means that using the script locally on a development machine, it must be invoked as an argument to Python, unless the ansible-runtime directory exists. Change-Id: Iafa573b1b144f98528d5e0aceb3f36e9de2a22a2
63 lines
1.7 KiB
Python
Executable File
63 lines
1.7 KiB
Python
Executable File
#!/usr/bin/env python
|
|
#
|
|
# Copyright 2016, Rackspace US, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
# (c) 2014, Nolan Brubaker <nolan.brubaker@rackspace.com>
|
|
import argparse
|
|
import os
|
|
import sys
|
|
|
|
from osa_toolki import tools
|
|
|
|
|
|
def args(arg_list):
|
|
parser = argparse.ArgumentParser(
|
|
usage='%(prog)s',
|
|
description='OpenStack Ansible Configuration Generator',
|
|
epilog='Licensed "Apache2.0"',
|
|
)
|
|
|
|
parser.add_argument(
|
|
'--base',
|
|
'-b',
|
|
help="Base file to be used.",
|
|
)
|
|
|
|
parser.add_argument(
|
|
'--conf_dir',
|
|
'-c',
|
|
help=("Directory of service-specific configuration files.\n"
|
|
"Only files ending in *.aio will be processed"),
|
|
)
|
|
|
|
parser.add_argument(
|
|
'--output',
|
|
'-o',
|
|
help=("Path to combined output file, defaults to "
|
|
"./openstack_user_config.yml"),
|
|
default=os.path.join(os.getcwd(), 'openstack_user_config.yml')
|
|
)
|
|
|
|
return vars(parser.parse_args(arg_list))
|
|
|
|
if __name__ == "__main__":
|
|
script_args = args(sys.argv[1:])
|
|
|
|
config = tools.make_example_config(
|
|
script_args['base'],
|
|
script_args['conf_dir']
|
|
)
|
|
tools.write_example_config(script_args['output'], config)
|