Go to file

Peter Belanyi 24f40d5312 Add converted version of block and object storage

This patch extends the previous 'Don't use merge.py for overcloud'
commit with the cinder-storage.yaml and swift-storage.yaml templates.

Requirements for this to deploy:

1. Block and object storage images have to be built
(overcloud-cinder-volume and overcloud-swift-storage)

2. The images have to be loaded by devtest_overcloud.sh
OVERCLOUD_CINDER_ID=$(load-image -d $TRIPLEO_ROOT/overcloud-cinder-volume.qcow2)
OVERCLOUD_SWIFT_ID=$(load-image -d $TRIPLEO_ROOT/overcloud-swift-storage.qcow2)

Change-Id: I45f9d9f051970a83e26c0fd924d7c98276958113

2014-10-21 13:39:09 +02: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

Passthrough{Specific} and allNodesConfig for BlockStorage nodes

2014-10-17 17:16:11 +02:00

cinder-storage.yaml

Add converted version of block and object storage

2014-10-21 13:39:09 +02:00

compute.yaml

Add converted version of block and object storage

2014-10-21 13:39:09 +02:00

controller.yaml

Add converted version of block and object storage

2014-10-21 13:39:09 +02: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 unnecessary completion signal

2014-09-18 10:54:37 +01:00

nova-compute-instance.yaml

Merge "Refactor Heat dependencies for nova compute"

2014-10-16 15:42:43 +00:00

overcloud-resource-registry.yaml

Add converted version of block and object storage

2014-10-21 13:39:09 +02:00

overcloud-source.yaml

Merge "Configures haproxy to serve novnc_proxy"

2014-10-15 22:17:27 +00:00

overcloud-vlan-port.yaml

Fix spelling of controller0_VLANPort

2014-09-04 15:35:59 +10:00

overcloud-without-mergepy.yaml

Add converted version of block and object storage

2014-10-21 13:39:09 +02: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

Sort inputs and parameters

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

swift-deploy.yaml

Sort inputs and parameters

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

swift-source.yaml

Merge "Add SwiftMinPartHours parameter"

2014-10-07 20:50:59 +00:00

swift-storage-source.yaml

Sort inputs and parameters

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

swift-storage.yaml

Add converted version of block and object storage

2014-10-21 13:39:09 +02: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

Merge "Secure the MySQL bind-address on the undercloud"

2014-10-15 22:01:55 +00:00

undercloud-vlan-port.yaml

Expose public_interface_tag support.

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