aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
AgeCommit message (Collapse)AuthorFilesLines
2013-11-25Use merge.py for the undercloud templates.Dan Prince1-2/+10
This will require some changes to our devtest scripts and TOCI to ensure we build the overcloud-vm template before attempting to use it. Change-Id: I14b5e4a0ccf5f18429bfc33e527bdb4760b8d1a3
2013-11-18Add metadata to configure swiftDerek Higgins1-2/+4
o Adds the required swift metadata (in swift-source.yaml). o Sets up glance to use the swift backend on the overcloud. o Sets up glance to use the file backend on the undercloud and seed, i.e. maintain the Status quo. Change-Id: I4a70ffbf9c51f1fea5cfc84d8718d3d30d36b3f2
2013-10-23Add Ironic-source.yamlChris Krelle1-0/+4
Mergeable Ironic yaml template. Makefile updated to create a undercloud-vm-ironic template. This patch will allow Ironic developers to include Ironic in the undercloud vm. Change-Id: Ie3998336a12f3509742634e59de5c9bee922d579
2013-10-14Add tuskar API service configurationRoman Podolyaka1-0/+4
Needed for I1d16e535ae50a06a8792e1613bb6b6c4647bf128 to work properly. Change-Id: Ib66e688bd7500f03dea7d4282607cd51078e9a51
2013-10-10Remove an unsed target from MakefileRoman Podolyaka1-5/+0
notcompute.yaml seems to be unsed for a while, but it's still present in Makefile (its dependencies were removed by change I952c630ca424d114feb643a6c34d182cad660f26). Change-Id: If5d84bd822f748c962cdb2b95b6bbd5d5e1f11fa
2013-09-19Add functional tests and examples for mergeClint Byrum1-0/+3
merge.py is undocumented and untested, which is undesirable, as it does not seem to be going away any time soon. Change-Id: I7e4870e58a32c567e5947b9a48893b8210ad4d65
2013-07-10Generate overcloud.yaml using overcloud-source.Clint Byrum1-2/+2
This new version does not need any nested stacks and correctly references notcompute. Change-Id: I16f846f7983a956b5159d17bef85cf6a87d69b45
2013-07-10Quantum -> Neutron renameDerek Higgins1-1/+1
Almost all references to quantum have been changed neutron in tripleo-image-elements. Change-Id: Ib17353d5834dd95d0348f62111074180c6e47181
2013-07-10Refine the Makefile rules.Robert Collins1-2/+3
The make rules in use were duplicative, which leads to maintenance headaches. Change-Id: Ic9e37796422caa2427c1575eb776c5d6a98516c3
2013-07-09Update bootstack-vm to match undercloud.Clint Byrum1-0/+3
Also add Makefile stanza to produce overcoud.yaml from bootstack-vm and nova-compute-group. This should allow independent usage of nova-compute-group without having to manually update overcloud. Change-Id: Id2bd20596e6be887b55019fdad31e6b0f4762eb7
2013-06-06Use slave roles in Makefile.Clint Byrum1-1/+1
2013-06-06Add a Makefile for regenerating common mergesClint Byrum1-0/+4