summaryrefslogtreecommitdiffstats
path: root/controller-config.yaml
AgeCommit message (Collapse)AuthorFilesLines
2015-01-27Controller: consolidated nested stackDan Prince1-241/+0
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-27Merge "Add parameter to manage usage of Neutron l3_ha option"Jenkins1-0/+1
2015-01-09Add parameter to manage usage of Neutron l3_ha optionGiulio Fidente1-0/+1
This change will allow for the enablement of Neutron routers HA via the new NeutronL3HA parameter. Change-Id: Ia5f7c0b4e89159456482e840c50d166ec5f25d4c Implements: blueprint tripleo-icehouse-ha-production-configuration
2015-01-08Remove invalid NTP configuration in templatesNicholas Randon1-1/+1
Currently the all templates have an invalid setting for NTP setup for the fudge setting. This should be removed from the templates which will remove the warning seen in syslog. ntpd[...]: inappropriate address xxx.xxx.xxx.xxx for the fudge command, line ignored Partial-Bug: 1408379 Relates-To: Ib9931b84925d9ceb32f18e9adc5be64402fbf61e Change-Id: I56a03dc0a899a8c515f2a05d678d7e80e9b7b93c
2015-01-05Controller: Split out software configDan Prince1-0/+240
This is a step towards supporting pluggable software configurations in the heat templates. By moving controller-config out of controller.yaml we make it possible to define alternate implementations by changing the OS::TripleO::ControllerConfig value in the overcloud-resource-registry.yaml heat environment file. Change-Id: I228216a0b55ff2d384b281d9ad2a61b93d58dab9