Go to file

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

examples

Make LaunchConfiguration resources mergeable

2013-10-14 15:30:24 +03:00

tripleo_heat_merge

Make merge.py installable as a package using pbr

2013-12-17 15:53:08 +02:00

.gitignore

Make merge.py installable as a package using pbr

2013-12-17 15:53:08 +02:00

.gitreview

Update stackforge references to openstack

2013-08-17 22:57:57 -04:00

babel.cfg

Add release configuration.

2013-10-22 17:49:35 +01:00

base.yaml

Set NoEcho: true for parameters containing secrets

2013-09-17 15:18:10 -07:00

ironic-source.yaml

Name the undercloud resources with 'undercloud'.

2013-11-26 08:58:42 -05:00

Makefile

Make merge.py installable as a package using pbr

2013-12-17 15:53:08 +02:00

MANIFEST.in

Add release configuration.

2013-10-22 17:49:35 +01:00

nagios3.yaml

Set NoEcho: true for parameters containing secrets

2013-09-17 15:18:10 -07:00

notcompute.yaml

Set NoEcho: true for parameters containing secrets

2013-09-17 15:18:10 -07:00

nova-compute-group.yaml

Set NoEcho: true for parameters containing secrets

2013-09-17 15:18:10 -07:00

nova-compute-instance.yaml

Permit setting overcloud image update policies.

2013-12-17 15:26:32 +13:00

overcloud-source.yaml

Permit setting overcloud image update policies.

2013-12-17 15:26:32 +13:00

README.md

Add functional tests and examples for merge

2013-09-19 13:02:03 -07:00

requirements.txt

Add release configuration.

2013-10-22 17:49:35 +01:00

setup.cfg

Make merge.py installable as a package using pbr

2013-12-17 15:53:08 +02:00

setup.py

Add release configuration.

2013-10-22 17:49:35 +01:00

swift-source.yaml

Fix case of OpenStack in templates.

2013-11-26 11:20:22 -05:00

test_merge.bash

Make merge.py installable as a package using pbr

2013-12-17 15:53:08 +02:00

test-requirements.txt

Add release configuration.

2013-10-22 17:49:35 +01:00

tox.ini

Add release configuration.

2013-10-22 17:49:35 +01:00

tuskar-source.yaml

Name the undercloud resources with 'undercloud'.

2013-11-26 08:58:42 -05:00

undercloud-bm-source.yaml

Name the undercloud resources with 'undercloud'.

2013-11-26 08:58:42 -05:00

undercloud-source.yaml

Merge "Fix case of OpenStack in templates."

2013-11-27 18:00:15 +00:00

undercloud-vm-source.yaml

Name the undercloud resources with 'undercloud'.

2013-11-26 08:58:42 -05:00

README.md

templates

Generic templates to describe multi-host infrastructure, consumable by OpenStack Heat, Crowbar, others.

merge.py

The Makefile contains several targets for generated templates, see its contents for all of them. To run functional tests for merge.py, run 'make test'.