diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | setup.cfg | 10 | ||||
| -rwxr-xr-x | test_merge.bash | 9 | ||||
| -rw-r--r-- | tripleo_heat_merge/__init__.py | 0 | ||||
| -rw-r--r-- | tripleo_heat_merge/merge.py (renamed from merge.py) | 0 |
6 files changed, 19 insertions, 14 deletions
@@ -45,3 +45,7 @@ nosetests.xml *.swp doc/_build + +# Built by pbr (python setup.py sdist): +AUTHORS +ChangeLog @@ -1,23 +1,23 @@ overcloud.yaml: overcloud-source.yaml nova-compute-instance.yaml swift-source.yaml # $^ won't work here because we want to list nova-compute-instance.yaml as # a prerequisite but don't want to pass it into merge.py - python merge.py overcloud-source.yaml swift-source.yaml > $@.tmp + python ./tripleo_heat_merge/merge.py overcloud-source.yaml swift-source.yaml > $@.tmp mv $@.tmp $@ undercloud-vm.yaml: undercloud-source.yaml undercloud-vm-source.yaml - python merge.py $^ > $@.tmp + python ./tripleo_heat_merge/merge.py $^ > $@.tmp mv $@.tmp $@ undercloud-bm.yaml: undercloud-source.yaml undercloud-bm-source.yaml - python merge.py $^ > $@.tmp + python ./tripleo_heat_merge/merge.py $^ > $@.tmp mv $@.tmp $@ undercloud-vm-tuskar.yaml: undercloud-source.yaml undercloud-vm-source.yaml tuskar-source.yaml - python merge.py $^ > $@.tmp + python ./tripleo_heat_merge/merge.py $^ > $@.tmp mv $@.tmp $@ undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-source.yaml ironic-source.yaml - python merge.py $^ > $@.tmp + python ./tripleo_heat_merge/merge.py $^ > $@.tmp mv $@.tmp $@ test: @@ -17,8 +17,8 @@ classifier = Environment :: Console [files] -data_files = - share/tripleo-heat-tempaltes/examples = examples/* - share/tripleo-heat-templates = - Makefile - *.yaml +packages = + tripleo_heat_merge +[entry_points] +console_scripts = + tripleo-heat-merge = tripleo_heat_merge.merge:main diff --git a/test_merge.bash b/test_merge.bash index e6bfb192..2f8a4cc9 100755 --- a/test_merge.bash +++ b/test_merge.bash @@ -23,10 +23,11 @@ run_test() { cleanup } echo -run_test "python merge.py examples/source.yaml" examples/source_lib_result.yaml -run_test "python merge.py examples/source2.yaml" examples/source2_lib_result.yaml -run_test "python merge.py examples/source_include_subkey.yaml" examples/source_include_subkey_result.yaml -run_test "python merge.py examples/launchconfig1.yaml examples/launchconfig2.yaml" examples/launchconfig_result.yaml +merge_py="./tripleo_heat_merge/merge.py" +run_test "python $merge_py examples/source.yaml" examples/source_lib_result.yaml +run_test "python $merge_py examples/source2.yaml" examples/source2_lib_result.yaml +run_test "python $merge_py examples/source_include_subkey.yaml" examples/source_include_subkey_result.yaml +run_test "python $merge_py examples/launchconfig1.yaml examples/launchconfig2.yaml" examples/launchconfig_result.yaml echo trap - EXIT exit $fail diff --git a/tripleo_heat_merge/__init__.py b/tripleo_heat_merge/__init__.py new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/tripleo_heat_merge/__init__.py diff --git a/merge.py b/tripleo_heat_merge/merge.py index 053a683a..053a683a 100644 --- a/merge.py +++ b/tripleo_heat_merge/merge.py |