Go to file

Jonathan Brownell 3e30e6ab8a Fix bash env var conditionals in merge.py call to be consistent

Bash syntax ${ENV:-'0'} and ${ENV='0'} vary only in their behavior
when $ENV is set to an empty string (in which case the former
expression results in '0' while the latter results in ''.)

There is no reason the Makefile should be using the latter
expression, and rather confusing when the two different forms
are used side-by-side on the same line.

Change-Id: I66bb5ea7437c3f2aa9bc4e1afc9b522c450ff976

2014-08-04 13:56:01 -07:00

examples

Port all templates to HOT

2014-08-04 08:57:52 +12:00

tripleo_heat_merge

Port all templates to HOT

2014-08-04 08:57:52 +12:00

.gitignore

Remove the tuskar-source template

2014-06-04 12:16:24 +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

Port all templates to HOT

2014-08-04 08:57:52 +12:00

block-storage-nfs.yaml

Port all templates to HOT

2014-08-04 08:57:52 +12:00

block-storage.yaml

Port all templates to HOT

2014-08-04 08:57:52 +12:00

controller.yaml

Port all templates to HOT

2014-08-04 08:57:52 +12:00

debian-mirror.yaml

Port all templates to HOT

2014-08-04 08:57:52 +12:00

LICENSE

Add license file

2014-01-20 11:58:20 +01:00

Makefile

Fix bash env var conditionals in merge.py call to be consistent

2014-08-04 13:56:01 -07:00

MANIFEST.in

Add release configuration.

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

nagios3.yaml

Port all templates to HOT

2014-08-04 08:57:52 +12:00

nfs-server-source.yaml

Port all templates to HOT

2014-08-04 08:57:52 +12:00

nova-compute-config.yaml

Port all templates to HOT

2014-08-04 08:57:52 +12:00

nova-compute-instance.yaml

Port all templates to HOT

2014-08-04 08:57:52 +12:00

overcloud-source.yaml

Port all templates to HOT

2014-08-04 08:57:52 +12: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

ssl-source.yaml

Port all templates to HOT

2014-08-04 08:57:52 +12:00

swift-deploy.yaml

Port all templates to HOT

2014-08-04 08:57:52 +12:00

swift-source.yaml

Port all templates to HOT

2014-08-04 08:57:52 +12:00

swift-storage-source.yaml

Port all templates to HOT

2014-08-04 08:57:52 +12:00

test_merge.bash

merge.py --hot to process and generate HOT

2014-08-01 10:49:59 +12: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

undercloud-bm-nova-config.yaml

Port all templates to HOT

2014-08-04 08:57:52 +12:00

undercloud-bm-nova-deploy.yaml

Port all templates to HOT

2014-08-04 08:57:52 +12:00

undercloud-source.yaml

Port all templates to HOT

2014-08-04 08:57:52 +12:00

undercloud-vm-ironic-config.yaml

Port all templates to HOT

2014-08-04 08:57:52 +12:00

undercloud-vm-ironic-deploy.yaml

Port all templates to HOT

2014-08-04 08:57:52 +12:00

undercloud-vm-nova-config.yaml

Port all templates to HOT

2014-08-04 08:57:52 +12:00

undercloud-vm-nova-deploy.yaml

Port all templates to HOT

2014-08-04 08:57:52 +12: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'.