aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2014-01-02Add Ceilometer parameters for the overcloudTomas Sedovic2-0/+43
2013-12-17Make merge.py installable as a package using pbrmarios6-14/+19
2013-12-17Permit setting overcloud image update policies.Robert Collins2-0/+12
2013-12-16Adds included-template-dir param for resolving template FileIncludesmarios1-9/+11
2013-11-29Make merge.py invokable from another scriptmarios1-132/+146
2013-11-27Merge "Fix case of OpenStack in templates."Jenkins3-3/+3
2013-11-26Fix case of OpenStack in templates.Dan Prince3-3/+3
2013-11-26Name the undercloud resources with 'undercloud'.Dan Prince5-14/+14
2013-11-25Wait for o-r-c on nova compute as well.Clint Byrum2-1/+12
2013-11-25Use merge.py for the undercloud templates.Dan Prince6-239/+89
2013-11-20enable Ironic password for keystone authChris Krelle1-2/+6
2013-11-18Add metadata to configure swiftDerek Higgins6-5/+45
2013-11-07Merge "Drop NeutronNativePXE option from undercloud tmpls"Jenkins2-12/+0
2013-11-06Drop NeutronNativePXE option from undercloud tmplsDan Prince2-12/+0
2013-11-05Fix KeystoneURLImre Farkas1-6/+10
2013-10-29Rename heat_watch_server_url to watch_server_urlDerek Higgins3-3/+3
2013-10-24Merge "Add Ironic-source.yaml"Jenkins2-0/+14
2013-10-23Merge "Disable nova bm file injection in undercloud"Jenkins2-0/+2
2013-10-23Add Ironic-source.yamlChris Krelle2-0/+14
2013-10-23Disable nova bm file injection in undercloudRoman Podolyaka2-0/+2
2013-10-23Merge "Add KeystoneURL to Outputs section"Jenkins1-0/+11
2013-10-22Add release configuration.Chris Jones7-0/+61
2013-10-22Add KeystoneURL to Outputs sectionImre Farkas1-0/+11
2013-10-16Merge "Add tuskar API service configuration"Jenkins3-0/+26
2013-10-15Move os-collect-config sectionDerek Higgins1-11/+11
2013-10-14Add tuskar API service configurationRoman Podolyaka3-0/+26
2013-10-14Make LaunchConfiguration resources mergeableRoman Podolyaka5-8/+98
2013-10-14Hide the AdminToken too.Robert Collins3-0/+3
2013-10-14Add metadata for the nova floating-ips extension.Robert Collins1-0/+2
2013-10-14Alpha sort the nova and neutron sections.Robert Collins1-14/+14
2013-10-11Add parameters for undercloud power_managers.Dan Prince2-2/+12
2013-10-12Permit overriding the default route for neutron.Robert Collins1-0/+6
2013-10-12Allow making the public interface a vlan.Robert Collins1-0/+6
2013-10-12Make it possible to set the public interface ip.Robert Collins1-0/+7
2013-10-11Make neutron public interface configurable.Robert Collins3-3/+18
2013-10-11Delete unused interfaces.control key.Robert Collins4-14/+0
2013-10-10Merge "Remove an unsed target from Makefile"Jenkins1-5/+0
2013-10-10Remove an unsed target from MakefileRoman Podolyaka1-5/+0
2013-10-10Add a waitcondition for signalling stack-up.Robert Collins1-0/+11
2013-10-07Merge "Add a bare metal undercloud template."Jenkins1-0/+194
2013-10-01Make test_merge.bash executableDerek Higgins1-0/+0
2013-10-01Add a bare metal undercloud template.Robert Collins1-0/+194
2013-09-30Add recursive whole-file __include__ tagClint Byrum6-2/+84
2013-09-30Merge "Make it possible to enable native neutron PXE."Jenkins1-0/+6
2013-09-27Merge "Set the undercloud host name to 'undercloud'."Jenkins1-1/+1
2013-09-26Set the undercloud host name to 'undercloud'.Dan Prince1-1/+1
2013-09-26Make it possible to enable native neutron PXE.Robert Collins1-0/+6
2013-09-25Refactor test_merge.bash for multiple testsClint Byrum2-16/+23
2013-09-19Add functional tests and examples for mergeClint Byrum7-1/+86
2013-09-19Provide Neutron password in compute metadataRoman Podolyaka1-0/+2