openstack
/
tripleo-heat-templates
Code Issues Proposed changes
RETIRED, Heat templates for deploying OpenStack
537 Commits 3 Branches 28 Tags 322 MiB
Go to file
Dan Prince 7f09f73a31 Controller: consolidated nested stack 
In I228216a0b55ff2d384b281d9ad2a61b93d58dab9 we split
out just the Controller software config in an effort
to provide hooks for alternate implementations (puppet).

This sort of worked but caused quirky ordering issues
with signal handling. It also causes problems for Tuskar
which would prefer to think of these nested stacks and
not have us split out just the software configs like this.

This patch moves all the controller related stuff for
our two implementations:

 controller.yaml: is used by os-apply-config (uses the
tripleo-image-elements)
 controller-puppet.yaml: uses stackforge puppet-* modules for
configuration

By duplicating the entire controller in this manner we make
it much easier to create dependencies and implement proper
signal handling. The only (temporary) downside is the duplication
of parameters most of which will eventually go away when we move towards
using the global parameters via Heat environment files instead.

Change-Id: Iaf3c889d7c8815f862308cd8e15ce1010059f5c6
 		2015-01-27 09:04:37 -05:00
examples Merge "Make removing nodes from scaled items possible." 2014-08-13 20:05:17 +00:00
puppet Puppet: overcloud controller config 2015-01-08 09:52:50 -05: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
LICENSE Add license file 2014-01-20 11:58:20 +01:00
MANIFEST.in Add release configuration. 2013-10-22 17:49:35 +01:00
Makefile Bring back (abandoned) support for Cinder/NFS 2014-12-11 00:19:27 +01:00
README.md Add functional tests and examples for merge 2013-09-19 13:02:03 -07: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.yaml Remove default flavor from every template 2014-11-27 13:07:10 +11:00
cinder-storage.yaml Merge "Remove default flavor from every template" 2014-12-09 21:34:15 +00:00
compute-config-puppet.yaml Add parameter to manage usage of Neutron l3_ha option 2015-01-09 19:24:53 +01:00
compute-config.yaml Merge "Add parameter to manage usage of Neutron l3_ha option" 2015-01-27 10:03:34 +00:00
compute.yaml Add parameter to manage usage of Neutron l3_ha option 2015-01-09 19:24:53 +01:00
controller-puppet.yaml Controller: consolidated nested stack 2015-01-27 09:04:37 -05:00
controller.yaml Controller: consolidated nested stack 2015-01-27 09:04:37 -05:00
debian-mirror.yaml Sort inputs and parameters 2014-10-08 15:40:39 +01:00
nagios3.yaml Sort inputs and parameters 2014-10-08 15:40:39 +01:00
net-config-bond.yaml Compute: drive NW configuration via software conf 2014-12-19 21:24:56 -05:00
net-config-bridge.yaml Compute: drive NW configuration via software conf 2014-12-19 21:24:56 -05:00
net-config-noop.yaml Compute: drive NW configuration via software conf 2014-12-19 21:24:56 -05:00
nfs-source.yaml Bring back (abandoned) support for Cinder/NFS 2014-12-11 00:19:27 +01:00
nova-compute-config.yaml Merge "Add parameter to manage usage of Neutron l3_ha option" 2015-01-27 10:03:34 +00:00
nova-compute-instance.yaml Add parameter to manage usage of Neutron l3_ha option 2015-01-09 19:24:53 +01:00
overcloud-resource-registry-puppet.yaml Controller: consolidated nested stack 2015-01-27 09:04:37 -05:00
overcloud-resource-registry.yaml Controller: consolidated nested stack 2015-01-27 09:04:37 -05:00
overcloud-source.yaml Merge "Add parameter to manage usage of Neutron l3_ha option" 2015-01-27 10:03:34 +00: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 Merge "Add parameter to manage usage of Neutron l3_ha option" 2015-01-27 10:03:34 +00: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 Remove default flavor from every template 2014-11-27 13:07:10 +11:00
swift-storage.yaml Add SwiftMountCheck to overcloud-without-mergepy 2015-01-09 10:12:18 -05:00
test-requirements.txt Add release configuration. 2013-10-22 17:49:35 +01:00
test_merge.bash Make removing nodes from scaled items possible. 2014-08-12 15:33:01 +12: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 Set default network interfaces to nic1 2014-12-05 15:16:12 -05:00
undercloud-source.yaml Remove invalid NTP configuration in templates 2015-01-08 15:54:05 +00: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 Set default network interfaces to nic1 2014-12-05 15:16:12 -05: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 Set default network interfaces to nic1 2014-12-05 15:16:12 -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'.