diff --git a/setup.py b/setup.py index 4e5de3f..168e850 100644 --- a/setup.py +++ b/setup.py @@ -99,7 +99,7 @@ setup( 'functest-test = zaza.charm_lifecycle.test:main', 'current-apps = zaza.model:main', 'tempest-config = zaza.tempest_config:main', - 'flatten-bundle = zaza.utilities.bundle:main', + 'remove-placement = zaza.utilities.bundle:main', ] }, license='Apache-2.0: http://www.apache.org/licenses/LICENSE-2.0', diff --git a/tox.ini b/tox.ini index 23559e7..e2b6f65 100644 --- a/tox.ini +++ b/tox.ini @@ -52,9 +52,9 @@ commands = {envdir}/bin/python3 setup.py install sudo su {env:USER} -c 'source {envdir}/bin/activate && functest-run-suite --keep-model' -[testenv:flatten] +[testenv:remove-placement] basepython = python3 deps = -r{toxinidir}/requirements.txt commands = {envdir}/bin/python3 setup.py install - flatten-bundle {posargs} \ No newline at end of file + remove-placement {posargs} \ No newline at end of file diff --git a/zaza/utilities/bundle.py b/zaza/utilities/bundle.py index 411e3dc..412050e 100644 --- a/zaza/utilities/bundle.py +++ b/zaza/utilities/bundle.py @@ -51,7 +51,7 @@ def parse_args(args): """ parser = argparse.ArgumentParser() parser.add_argument('-i', '--input', - help='Bundle to flatten', + help='Bundle to remove placement from', required=True) parser.add_argument('-o', '--output', help='Where to output', @@ -62,9 +62,7 @@ def parse_args(args): def main(): """Run the configuration defined by the command line args. - Run the configuration defined by the command line args or if none were - provided read the configuration functions from the charms tests.yaml - config file + Remove machine placement as specified in the command line args """ args = parse_args(sys.argv[1:]) with open(args.input, 'r') as file: