Commit Graph

5 Commits

Author SHA1 Message Date
Dan Prince
fba215a69d Drop deprecated templates/Makefile/merge.py
This patch drops a bunch of deprecated stuff from
tripleo-heat-templates. Once we remove the Makefile
(which creates overcloud.yaml) we can proceed
in renaming overcloud-without-mergepy.yaml to
overcloud.yaml.

Change-Id: Ic6ab3777d19e207cae29dcbc2e3839815cd80181
2015-11-25 15:00:13 -05:00
Dan Prince
84aa3e8c39 Update README.rst
This commit renames and updates the rather outdated README
for this project.

Change-Id: Ibd1531dc14a2c04d8d91a3339c1df47a41c94790
2015-10-08 14:11:57 -04:00
Robert Collins
97174ff005 Remove hardcoded version.
We use semantic versioning, not pbr's pre-version facility. This
line causes local package builds to have the wrong version, and
pbr will in future detect this and error.

Change-Id: Ia625d31e87d137e867badcdeac1f33630257bb8c
2014-08-20 13:04:17 +12:00
marios
c9ce27c981 Make merge.py installable as a package using pbr
Now that merge.py is invokable from another script
(Ia6b6416fe10358d23f2b120283eecaf4c1178cfd) and from comments at that
review, it makes sense to offer a nicer way to consume the merge
functionality.

Once you git clone tripleo-heat-templates you can python setup.py
install and get /usr/bin/tripleo_heat_merge as well as a
tripleo_heat_merge package in python2.7/site-packages.

Makefile edits required because we moved merge.py into the
tripleo_heat_merge directory for the packaging.

Change-Id: I587fa7a826f93f89e8e5c266af7f5765438fe738
2013-12-17 15:53:08 +02:00
Chris Jones
80da8e3968 Add release configuration.
We can now release through openstack.org infrastructure.

Change-Id: I6dff6ae4a97db15bdc4ce419e46e9a125bec277c
2013-10-22 17:49:35 +01:00