Go to file

Dan Prince b91f8cd492 Remove missing cinder-storage Neutron* parameters

In I00af10e07feed6c9c97ee6cad545dbff88cd6afc we removed the
Neutron* parameters from cinder-storage.yaml but we forgot to
also remove them from overcloud-without-mergepy.yaml.

Change-Id: I09f2eb278fa0eba1dff80884f12b6f682c7b0484

2014-12-05 21:07:32 -05:00

examples

Merge "Make removing nodes from scaled items possible."

2014-08-13 20:05:17 +00:00

tripleo_heat_merge

Deprecate Role and ImageBuilder metadata handling

2014-09-10 11:30:15 +02:00

.gitignore

Expose public_interface_tag support.

2014-08-28 13:34:38 -04: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

Sort inputs and parameters

2014-10-08 15:40:39 +01:00

block-storage-nfs.yaml

Switch to heat_template_version: 2013-05-23

2014-08-13 10:53:46 +12:00

block-storage.yaml

Add block completion signal

2014-10-21 10:32:45 +00:00

cinder-storage.yaml

Align the cinder-storage.yaml template with block-storage.yaml

2014-12-05 09:58:13 +01:00

compute-config.yaml

Add missing Neutron DVR params to without-mergepy

2014-12-05 20:48:33 -05:00

compute.yaml

Add missing Neutron DVR params to without-mergepy

2014-12-05 20:48:33 -05:00

controller.yaml

Add missing novncproxy settings to controller

2014-12-05 20:48:33 -05:00

debian-mirror.yaml

Sort inputs and parameters

2014-10-08 15:40:39 +01:00

LICENSE

Add license file

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

Makefile

Expose public_interface_tag support.

2014-08-28 13:34:38 -04:00

MANIFEST.in

Add release configuration.

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

nagios3.yaml

Sort inputs and parameters

2014-10-08 15:40:39 +01:00

nfs-server-source.yaml

Switch to heat_template_version: 2013-05-23

2014-08-13 10:53:46 +12:00

nova-compute-config.yaml

Remove LiveUpdate params

2014-12-01 10:05:44 -05:00

nova-compute-instance.yaml

Remove LiveUpdate params

2014-12-01 10:05:44 -05:00

overcloud-resource-registry.yaml

Split out Nova software config

2014-11-14 11:56:22 -05:00

overcloud-source.yaml

Remove duplicate Neutron params in overcloud

2014-12-05 20:48:33 -05:00

overcloud-vlan-port.yaml

Don't replace OS::Neutron::Port on update

2014-10-28 19:29:50 +00:00

overcloud-without-mergepy.yaml

Remove missing cinder-storage Neutron* parameters

2014-12-05 21:07:32 -05: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

Remove hardcoded version.

2014-08-20 13:04:17 +12:00

setup.py

Add release configuration.

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

ssl-source.yaml

Provide a single stunnel connect_host

2014-11-13 10:20:53 +00:00

swift-deploy.yaml

Add swift.mount-check metadata

2014-11-12 17:09:04 +00:00

swift-source.yaml

Add swift.mount-check metadata

2014-11-12 17:09:04 +00:00

swift-storage-source.yaml

Add swift.mount-check metadata

2014-11-12 17:09:04 +00:00

swift-storage.yaml

Add swift.mount-check metadata

2014-11-12 17:09:04 +00:00

test_merge.bash

Make removing nodes from scaled items possible.

2014-08-12 15:33:01 +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

Undercloud params for compute driver and manager

2014-09-05 16:18:01 -04:00

undercloud-bm-nova-deploy.yaml

Undercloud params for compute driver and manager

2014-09-05 16:18:01 -04:00

undercloud-source.yaml

Fix empty local_ip in ml2_conf.ini on undercloud

2014-11-25 15:55:12 -08:00

undercloud-vlan-port.yaml

Don't replace OS::Neutron::Port on update of undercloud

2014-11-10 11:43:51 +01:00

undercloud-vm-ironic-config.yaml

Undercloud params for compute driver and manager

2014-09-05 16:18:01 -04:00

undercloud-vm-ironic-deploy.yaml

undercloud: use Nova compute Ironic driver

2014-09-19 10:44:32 -04:00

undercloud-vm-nova-config.yaml

Undercloud params for compute driver and manager

2014-09-05 16:18:01 -04:00

undercloud-vm-nova-deploy.yaml

Sort inputs and parameters

2014-10-08 15:40:39 +01: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'.