summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2014-01-28Merge "Make debugging merge.py in the test suite possible."Jenkins1-1/+1
2014-01-28Merge "Permit writing output to other than stdout."Jenkins1-1/+8
2014-01-29Make debugging merge.py in the test suite possible.Robert Collins1-1/+1
2014-01-29Permit writing output to other than stdout.Robert Collins1-1/+8
2014-01-25Allow setting a single NTP ServerClint Byrum1-0/+6
2014-01-24Merge "Use OS::Heat::UpdateWaitConditionHandle"Jenkins1-1/+1
2014-01-23Merge "Expose bridge_mappings in the overcloud."Jenkins1-1/+7
2014-01-23Expose bridge_mappings in the overcloud.Robert Collins1-1/+7
2014-01-22Merge "Add SSL configuration metadata for overclouds."Jenkins2-2/+45
2014-01-20Add license fileDirk Mueller1-0/+202
2014-01-17Merge "Add optional cinder storage node to overcloud"Jenkins2-0/+72
2014-01-16Use OS::Heat::UpdateWaitConditionHandleClint Byrum1-1/+1
2014-01-17Add SSL configuration metadata for overclouds.Robert Collins2-2/+45
2014-01-15Add optional cinder storage node to overcloudRyan Brady2-0/+72
2014-01-14Merge "Add undercloud-vm-ironic-source yaml file"Jenkins2-1/+22
2014-01-14Merge "Add all and clean targets to makefile"Jenkins1-0/+12
2014-01-14Merge "Avoid echoing comment from makefile recipe"Jenkins1-3/+4
2014-01-14Add all and clean targets to makefileMark McLoughlin1-0/+12
2014-01-14Avoid echoing comment from makefile recipeMark McLoughlin1-3/+4
2014-01-13Add a wait condition to undercloud stackRoman Podoliaka1-0/+11
2014-01-10Add undercloud-vm-ironic-source yaml fileDevananda van der Veen2-1/+22
2014-01-08Merge "Add Ceilometer parameters for the overcloud"Jenkins2-0/+43
2014-01-06Configure undercloud to use ext4 ephemeral FSClint Byrum2-0/+2
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