commit dea5f2faacb4c051c77d84959233101fa119919b
Merge: df18ea2 fff4751
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 7 08:31:11 2013 +0000

    Merge "Drop NeutronNativePXE option from undercloud tmpls"

commit fff47517c03d02b25fcac6ac40bb9c93db53fd9e
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Nov 5 12:38:56 2013 +0800

    Drop NeutronNativePXE option from undercloud tmpls
    
    Depends on https://review.openstack.org/55338
    
    We now just want to default to using Neutron native PXE.
    
    Change-Id: Idec46638b88d7c050e721588e5dbddf233d02493

commit df18ea222c606619e7567f8968cbc6d69a5c61c3
Author: Imre Farkas <ifarkas@redhat.com>
Date:   Tue Nov 5 14:23:58 2013 +0100

    Fix KeystoneURL
    
    Currently KeystoneURL reports back the noncompute instance IP, not the proper
    API endpoint for the Keystone service.
    
    Change-Id: If121620ec549d33f81522465f72e501b7723dd7d

commit 99b21423ee679c1d81402969c8c2b258f3b9080b
Author: Derek Higgins <derekh@redhat.com>
Date:   Tue Oct 29 14:48:21 2013 +0000

    Rename heat_watch_server_url to watch_server_url
    
    The other *_server_url parameters are not prefixed with heat_ and this
    is already in the heat namespace.
    
    Change-Id: I24effcfedccb7b69b4e4d022db6676da51083401

commit 7d14e86bfd9b1f69cd5b3fa32909a04bc2b90375
Merge: 4671819 2fcc443
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 24 11:41:18 2013 +0000

    Merge "Add Ironic-source.yaml"

commit 4671819e7e89fa320e1a2967410af044bdd1252e
Merge: fff9c57 445dda5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 23 23:46:44 2013 +0000

    Merge "Disable nova bm file injection in undercloud"

commit 2fcc443bf2d00dc04d7bab831ea0b55e52a5656a
Author: Chris Krelle <nobodycam@gmail.com>
Date:   Fri Aug 30 11:46:46 2013 -0700

    Add Ironic-source.yaml
    
    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

commit 445dda586391c1c9d293f55f216596889066a8a0
Author: Roman Podolyaka <rpodolyaka@mirantis.com>
Date:   Wed Oct 23 14:13:31 2013 +0300

    Disable nova bm file injection in undercloud
    
    We are now relying on host routes feature of neutron-dhcp-agent,
    so it's time to disable nova bm file injection in undercloud
    and use neutron-dhcp-agent instead (if file injection is enabled
    the static route for metadata server is not set and overcloud
    machines hit seed vm metadata server instead of undercloud one).
    
    Co-Authored-By: Derek Higgins <derekh@redhat.com>
    
    Partial-Bug: #1241042
    
    Change-Id: I04a7fb0399031cbf475a427cceac080296f9bc8d

commit fff9c57ac660db407c70c989a23dc0fa395bce07
Merge: 80da8e3 5a99a01
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 23 09:51:27 2013 +0000

    Merge "Add KeystoneURL to Outputs section"

commit 80da8e39680f4da405861b33536012448244ba0d
Author: Chris Jones <cmsj@tenshu.net>
Date:   Wed Oct 16 19:48:57 2013 +0100

    Add release configuration.
    
    We can now release through openstack.org infrastructure.
    
    Change-Id: I6dff6ae4a97db15bdc4ce419e46e9a125bec277c

commit 5a99a0198f8ba522339b90147fc41175be43b700
Author: Imre Farkas <ifarkas@redhat.com>
Date:   Tue Oct 15 11:33:47 2013 +0200

    Add KeystoneURL to Outputs section
    
    Having the KeystoneURL accessible in Heat allows the user to access the
    overcloud services using the service catalog.
    
    Change-Id: Ie6ef1aadf2f027d0b0793fea59385832c9f0c25f

commit b3b5b600511515897f529750439776355c77d564
Merge: ee0a83e d3aa08d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 16 01:53:14 2013 +0000

    Merge "Add tuskar API service configuration"

commit ee0a83ec16d464472d0e6580272e6944530f4f9a
Author: Derek Higgins <derekh@redhat.com>
Date:   Tue Oct 15 22:53:23 2013 +0100

    Move os-collect-config section
    
    All these sections are in alphabetical order except this one.
    
    Change-Id: Id0586b5ba11e3c00e36397c7e2cd46e0c8cae292

commit d3aa08dd5f3d82d9b4348b0341e63c42876e9c90
Author: Roman Podolyaka <rpodolyaka@mirantis.com>
Date:   Fri Oct 11 17:52:55 2013 +0300

    Add tuskar API service configuration
    
    Needed for I1d16e535ae50a06a8792e1613bb6b6c4647bf128 to
    work properly.
    
    Change-Id: Ib66e688bd7500f03dea7d4282607cd51078e9a51

commit fcbead3871c995f4da423c9fffe9ed444407a5ce
Author: Roman Podolyaka <rpodolyaka@mirantis.com>
Date:   Fri Oct 11 17:54:09 2013 +0300

    Make LaunchConfiguration resources mergeable
    
    This can be very useful for merging of Metadata to be used
    by optional services (e. g. to add services like tuskar to
    undercloud on demand).
    
    Change-Id: Ifc4016d6e994064c0772c12e668e98bf055fada9

commit 8e36320284dc2cce39a521d1723082dd75f94f39
Author: Robert Collins <rbtcollins@hp.com>
Date:   Mon Oct 14 19:20:31 2013 +1300

    Hide the AdminToken too.
    
    This is arguably more important than passwords as it allow rooting
    keystone :).
    
    Change-Id: I12d8ae0f096480112a82d7598eedae64a6fbd861

commit ca45beefa94597f438a988c5e4db3dd4b1ccabad
Author: Robert Collins <rbtcollins@hp.com>
Date:   Mon Oct 14 11:12:09 2013 +1300

    Add metadata for the nova floating-ips extension.
    
    Nova defaults to trying to allocate floating ips from a neutron
    network called 'nova' but we called our external one ext-net (which
    various Neutron documentation uses), so we need to override it or the
    nova floating-ips extension isn't usable [without explicitly setting a
    pool in the API calls].
    
    Partial-Bug: #1239450
    Change-Id: I1ef78642bdc1f19d25422961350e4f02a8f6c16f

commit 0b9846ba25fd32aabfbaac5d92ae201f46c30800
Author: Robert Collins <rbtcollins@hp.com>
Date:   Mon Oct 14 11:07:20 2013 +1300

    Alpha sort the nova and neutron sections.
    
    I'm having a minor OCD moment.
    
    Change-Id: I49cdf078d24a38dcdb1f2801764dbcbd6dd10ccf

commit aac4d516da32a0a59ddc2d6b87c8f674b45626c7
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Oct 11 15:43:34 2013 -0400

    Add parameters for undercloud power_managers.
    
    Adds a new PowerManager parameter for the baremetal power
    management driver.
    
    Change-Id: I3d3b1f8e190d9de9705b2319726cdddb5624fc83

commit 4da722abd23d3f47a5b162b629b448c140460ce0
Author: Robert Collins <rbtcollins@hp.com>
Date:   Fri Oct 11 21:54:34 2013 +1300

    Permit overriding the default route for neutron.
    
    The intent here is that the undercloud default route will be discard,
    but the router kept for access to the metadata service, and this
    specified route will be used for all other traffic.
    
    Change-Id: Idf3f8252c4d4be30839d9d08ad7d4ce49538f04e

commit 5eee774cf2b138837b82f5bb681a9a6e677008ed
Author: Robert Collins <rbtcollins@hp.com>
Date:   Fri Oct 11 21:51:50 2013 +1300

    Allow making the public interface a vlan.
    
    In the CD overcloud we need to use a VLAN for public traffic.
    
    Change-Id: I8d674e1ae58063d9be338023819f174d1bc028e4

commit a96bc4b329affded94fe2ee85bd9b85926e0a5fe
Author: Robert Collins <rbtcollins@hp.com>
Date:   Fri Oct 11 21:45:10 2013 +1300

    Make it possible to set the public interface ip.
    
    This is already supported by the ovs agent, but we didn't need it for
    the emulated overclouds. Now we're working on bare metal, it's needed
    for some deployments.
    
    Change-Id: Ibb41c40d371e4c153a84fd09c370b158add75b81

commit 270aa4441c256d913aca12588b5cbabe09a1229d
Author: Robert Collins <rbtcollins@hp.com>
Date:   Fri Oct 11 21:06:43 2013 +1300

    Make neutron public interface configurable.
    
    Not all machines use eth0 :).
    
    Change-Id: I2d0cfd8df46e7eda1b7db2ea5c8e84d3e970c862

commit f8175fb55fd3d0a7c76ac8030157e02347c61525
Author: Robert Collins <rbtcollins@hp.com>
Date:   Fri Oct 11 19:18:45 2013 +1300

    Delete unused interfaces.control key.
    
    Change-Id: I3a84cf52cc46f0c338319a046d77edb2a9b29c45

commit 730017fafeda43f680bd34ca8375cf6c33239147
Merge: 9a745e8 6a898e9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 10 10:37:04 2013 +0000

    Merge "Remove an unsed target from Makefile"

commit 6a898e97176515eca0aef5a000cae39d09dbb497
Author: Roman Podolyaka <rpodolyaka@mirantis.com>
Date:   Thu Oct 10 12:45:42 2013 +0300

    Remove an unsed target from Makefile
    
    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

commit 9a745e8167adee395cae705d234d29d360d8b69b
Author: Robert Collins <rbtcollins@hp.com>
Date:   Thu Oct 10 13:56:30 2013 +1300

    Add a waitcondition for signalling stack-up.
    
    Without this we need horrible hacks to detect whether the cloud is
    ready to use.
    
    Change-Id: Ic5c5fd16c6c283d3d339e1f1238d3349d0b93f7c

commit e48aa3e4b6392081c4c1fbe31c34eac866af583c
Merge: 0326335 7668a52
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 7 10:12:52 2013 +0000

    Merge "Add a bare metal undercloud template."

commit 0326335160a5977df44ae40d4c81ab8e40833743
Author: Derek Higgins <derekh@redhat.com>
Date:   Tue Oct 1 09:29:53 2013 +0100

    Make test_merge.bash executable
    
    This is an executable script, lets make it so.
    
    Change-Id: Ie8e1196fdd7883447d05e89e001418d284bfcbf3

commit 7668a524258a793b7102d7831c7562db903d7fc7
Author: Robert Collins <rbtcollins@hp.com>
Date:   Tue Oct 1 13:44:06 2013 +1300

    Add a bare metal undercloud template.
    
    This should be factored into a lib and different includes, but right
    now - iteration one - we need the thing up and running.
    
    Change-Id: I1d0ed1c33385fd66ddfe39440f181dbb9b295fe9

commit 69f1dcc7cb1f881b9df0d0c5ac0c34627bc1d775
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Sep 25 11:15:59 2013 -0700

    Add recursive whole-file __include__ tag
    
    We can now merge an entire file with minimal effort.
    
    Change-Id: If86657fb9f9cca0f048c9e01100a3667597a6596

commit faa7cfbb196f399a41f337d2b21984f9184ed1b5
Merge: 3167fb4 43a9536
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 30 03:36:48 2013 +0000

    Merge "Make it possible to enable native neutron PXE."

commit 3167fb44f01fa15b9cd482d089fca3f41bb607f9
Merge: cd3ddc4 1333a3c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 27 09:37:57 2013 +0000

    Merge "Set the undercloud host name to 'undercloud'."

commit 1333a3c245c60043111a51d5ae8ba8855f514b48
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Sep 26 13:23:58 2013 -0400

    Set the undercloud host name to 'undercloud'.
    
    This makes more sense than calling it 'ubuntu'.
    
    Note: This will require an associated incubator change which
    I will push momentarily.
    
    Change-Id: I166b45a6ceb34635ed5ef7e29dd028f8c6a4cbe3

commit 43a95362d4b182ab78302d985cc5c0f115139909
Author: Robert Collins <rbtcollins@hp.com>
Date:   Thu Sep 26 18:31:44 2013 +1200

    Make it possible to enable native neutron PXE.
    
    This is used to control the dhcp_options_enabled flag in nova.conf,
    needed to enable PXE orchestration (until Nova assumes all Neutron
    libraries and servers support it).
    
    Change-Id: I035a2341d829a9987eeeebdd9c22f039e69489db

commit cd3ddc482fff7d96341a33613f78da0cbbbecdf4
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Sep 25 10:37:52 2013 -0700

    Refactor test_merge.bash for multiple tests
    
    We will be adding more tests, so make it more of a framework for that.
    
    Also fix up minor lib.yaml formatting bug.
    
    Change-Id: Ic0fe1679f8d62680dfd0acf215c849aa38b913da

commit 0dbf2810a0ee78658c35e61dc447c5f968226cb9
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Sep 18 18:08:08 2013 -0700

    Add functional tests and examples for merge
    
    merge.py is undocumented and untested, which is undesirable, as it does
    not seem to be going away any time soon.
    
    Change-Id: I7e4870e58a32c567e5947b9a48893b8210ad4d65

commit b7f0bb6123f75c87e4da51f6bfa7a92a515a898c
Author: Roman Podolyaka <rpodolyaka@mirantis.com>
Date:   Thu Sep 19 18:09:52 2013 +0300

    Provide Neutron password in compute metadata
    
    overcloud compute node makes requests to Neutron API
    and requires quantum_admin_password option of nova.conf
    to be set (it is defined in nova image element like
    quantum_admin_password={{neutron.service-password}}).
    
    Without this, booting of a user instance in overcloud
    fails, because nova-compute service can't authorize
    requests to Neutron API.
    
    Change-Id: Ie726d0c3d54abc6c24a45fde3f5af03fd2cf9e37

commit 73fbe1e1215615a1470b55b625b399cf17beae8b
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Sep 17 15:13:25 2013 -0700

    Set NoEcho: true for parameters containing secrets
    
    This prevents secret values being returned for stack-show.
    
    Change-Id: I82eff26fda31511b66c6371f6ded2a5fb559f3fb
    Fixes-Bug: #1226730

commit c2051996bc2262764c601763d5c98652baa14066
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue Sep 17 12:32:24 2013 -0700

    Finish correcting all OS::Nova::Server references
    
    Some references to first_private_address were missed and some of the
    Fn::Select calls were only half-completed.
    
    Change-Id: I92a4e5e67784e5d64ec6e44ddcac55762cde81eb

commit 287e97de9cc3dce498403c9cae69ae48108def9c
Author: Clint Byrum <clint@fewbar.com>
Date:   Mon Sep 16 17:29:24 2013 -0700

    Replace broken usage of first_private_address
    
    The OpenStack native OS::Nova::Server gives us the full list of
    networks rather than AWS::EC2::Instance's contrived view of 'private'
    and 'public'. We know we want ctlplane, and use Fn::Select to choose
    that network directly. The outer Fn::Select is meant to choose the
    first network every time, which may not always be correct, but is at
    this point.
    
    Change-Id: Iae54ab8d9ac8d84f4f6e2f86ac1b66aacb687473

commit a0cc5554a4cf01ca09565a0641f10799aa873897
Author: Robert Collins <rbtcollins@hp.com>
Date:   Tue Sep 17 09:32:18 2013 +1200

    Allow customising the Nova BM architecture.
    
    Nova BM can only run one architecture at a time, and the incubator
    currently documents running sed against undercloud-vm.yaml!
    
    Change-Id: Ib157cf405a40fa983f1df3fb3ed62d04262e3e81

commit ca4c32c086ae0584820a5833d826855e40814b53
Author: James Slagle <jslagle@redhat.com>
Date:   Mon Sep 16 13:27:59 2013 -0700

    Update PrivateIp to first_private_address.
    
    Update the PrivateIp attribute to first_private_address as a result of
    the change to the OS::Nova::Server type.
    
    Change-Id: Id90f8c7c4e0217e1f94d3e5134744a810390e7b7

commit a973207ccf80fd638f2d211c2ef8b1431aa70249
Author: Robert Collins <rbtcollins@hp.com>
Date:   Fri Sep 13 19:39:08 2013 +1200

    Make Heat service password configurable.
    
    So that it can be a snowflake! (unique).
    
    Change-Id: Ic823620ace7df5636cd9ff16dcd7476654692e6c

commit 5b7bf0a0e6ce17d250b65e313c27c28a6de60473
Author: Robert Collins <rbtcollins@hp.com>
Date:   Fri Sep 13 19:36:44 2013 +1200

    Remove unused swift undercloud definition.
    
    The undercloud doesn't contain swift.
    
    Change-Id: I1372ed28d7ee5bec2b0e03941bd8d50a0b749825

commit 3ad09e4e41ee40a4aa4436542f85953f0ab6b2c4
Author: Robert Collins <rbtcollins@hp.com>
Date:   Fri Sep 13 19:04:49 2013 +1200

    Get rid of global service-password.
    
    No longer needed, less globals == win.
    
    Change-Id: I2872e5a8775a09b2e857ef082f3b86109785a126

commit eadb34841f7b56b8c778800aabd8c41ff665153a
Author: Robert Collins <rbtcollins@hp.com>
Date:   Fri Sep 13 19:02:30 2013 +1200

    Add Nova service password.
    
    Another service converted to match the keystone model of unique
    accounts per service.
    
    Change-Id: I62fce289a7032138be3aca8c74df499c2b1fde28

commit ae40df0c2aa33a6a6637ff20ef96d139def51806
Author: Robert Collins <rbtcollins@hp.com>
Date:   Fri Sep 13 18:48:05 2013 +1200

    Add Glance service password.
    
    The in-instance scripts are about to require this.
    
    Change-Id: I0260da5502639acc60b2791e9f957952f7ab5956

commit 680b67c4596ac870a9db75fb9c5832106eec00dd
Author: Robert Collins <rbtcollins@hp.com>
Date:   Fri Sep 13 18:41:12 2013 +1200

    Add cinder service-password.
    
    The instance config is about to require this.
    
    Change-Id: Ia778a7f5926b54758e73a4ee0940ef42fe5be6a9

commit 98175ae8a4e209f176b189e4afb90eda5d6d2d0a
Author: Robert Collins <rbtcollins@hp.com>
Date:   Fri Sep 13 08:23:17 2013 +1200

    Remove trailing whitespace.
    
    Change-Id: Ifde42d405e22c32f4edc2fdd4f5aed5a0c8bff20

commit 6239598b100f61e85d9dcebb52f4e95e2d691493
Author: Clint Byrum <clint@fewbar.com>
Date:   Fri Sep 13 09:07:00 2013 -0700

    Remove unmaintained individual service templates
    
    First rule in the zombie apocalypse: Burn the dead.
    
    Change-Id: I952c630ca424d114feb643a6c34d182cad660f26

commit 8c12b7162324e04ebd83aa2e57eb05502caae471
Author: Clint Byrum <clint@fewbar.com>
Date:   Fri Sep 13 09:03:46 2013 -0700

    Use native server resource in overcloud
    
    Change-Id: I4745627508e8b6b687fc17527cdd3c41d09b0d80

commit 89ddd6fd934236c18b66c42b7a42681438e30258
Author: Clint Byrum <clint@fewbar.com>
Date:   Fri Sep 13 08:59:37 2013 -0700

    Use native resource for nova-compute-instance
    
    Change-Id: I347465b32578467ca3d9f55ea2994d832fcd8b3f

commit fae091e5c37e430bb249143e3938af5647124024
Author: Clint Byrum <clint@fewbar.com>
Date:   Fri Sep 13 08:57:15 2013 -0700

    Update undercloud-vm.yaml to use OS::Nova::Server
    
    Change-Id: I34c294c62bf5da4c01d72931173c055c6a13706c

commit a8d5dc5a23bf8a681ab5695b421f04a17547d65c
Author: Clint Byrum <clint@fewbar.com>
Date:   Fri Sep 13 08:42:01 2013 -0700

    Add support for merging OS::Nova::Server
    
    Change-Id: Id6a801ee36ae73d8c2133b455e9a850c1a7b6a4d

commit a5320b8f49d17e4ad6790ecafe5797382ba381a1
Author: Robert Collins <rbtcollins@hp.com>
Date:   Fri Sep 13 18:00:11 2013 +1200

    escription -> Description
    
    Change-Id: Iec40d309f3099998fbeb85de7538ed5e0d2e9c42

commit d65cd33bc0a1d67ed1cdcf40c18c5866b0720a8c
Author: Robert Collins <rbtcollins@hp.com>
Date:   Fri Sep 13 10:25:49 2013 +1200

    Add in Neutron service password.
    
    The in-instance scripts are being fixed to not confuse the admin
    password with the neutron service password.
    
    Change-Id: I341574bb838a9563120791b9ac014d75274a96aa

commit 21980f5d6519ac799a882e82713270d85efbaa9e
Author: Robert Collins <rbtcollins@hp.com>
Date:   Fri Sep 13 08:23:17 2013 +1200

    Make admin-password configurable.
    
    We use the admin password in in-instance scripts that configure e.g.
    nagios from the cloud metadata, but production clouds will all have
    unique passwords - it has to be a parameter.
    
    Change-Id: I1f6c697ce27580fd669c7623e7fcea4c96ec62d0

commit 8695e9aee7f5c5b0e5930295a3337d8173992758
Author: Robert Collins <rbtcollins@hp.com>
Date:   Wed Sep 11 21:44:53 2013 +1200

    Make the keystone admin token configurable.
    
    Because unique is good for auth secrets.
    
    Change-Id: Iaadc102d11d68d7fc059e62bd992de7ee6f2c818

commit c34e381a46ea6808256abb3300760cb422192869
Author: Monty Taylor <mordred@inaugust.com>
Date:   Sat Aug 17 22:57:51 2013 -0400

    Update stackforge references to openstack
    
    Change-Id: I3f1cc6ab666045257d5ef6afc3fd26c59d90e57b

commit bf7b11120921537f7f0f8c1994ed0ffdf8152220
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Aug 15 11:35:56 2013 -0700

    Migrate nova-compute-instance to split Metadata.
    
    The file was using the old 0.0.0.0 method from heat-localip, but it was
    missed when converting the other templates to a split Metadata approach
    to enable a machine to know its own IP.
    
    Change-Id: I0b117de12416a52950b1c7079f659df8649d67f9

commit 07ac7428976ea5a91c3371529be734df0ef38562
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Aug 15 04:14:26 2013 -0700

    Correct os-collect-config.cfn.path to be string.
    
    Specified as a list, it gets translated literally into
    ["NovaCompute0"] in /etc/os-collect-config.conf. This is not
    desirable and results in 500 errors because ["NovaCompute0"] does
    not exist.
    
    Change-Id: I7dc01937d73c0c0e5cea70f5a3202d0e43c4caed

commit 46c4ce37173e23a1a5bc68f9f5b0921e6f83be8b
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Jul 31 14:13:36 2013 -0700

    Load local IP using separate post-boot Metadata.
    
    Previously we could not feed the IP of an instance into its own
    Metadata because of circular dependency problems. 0.0.0.0 was used
    with the heat-localip element to work around this problem. This
    caused problems though, as heat-localip would edit the source local
    heat metadata, which would make cfn-hup and/or os-collect-config think
    that the Metadata had changed, causing it to restart everything every
    time we query the Metadata, which was about every five minutes.
    
    Now we can just query this inert LaunchConfiguration resource to get
    its' Metadata once it is ready. This resource will only change when
    legitimate things are changed in the stack, and so we won't restart
    everything every five minutes anymore. Note that when the native Heat
    DSL lands, the OS::Heat::SoftwareConfig resource is meant for exactly
    this purpose.
    
    After this is merged we no longer need the heat-localip element.
    
    Fixes bug #1202322
    
    Change-Id: Id06323ba43203570eeebfa5b3d03fa56c16c0c10

commit 99a1e7525015f4e710e3de6e041cffcd264153cf
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Jul 31 14:07:05 2013 -0700

    Migrate from cfn-hup to os-collect-config
    
    Os-collect-config is meant to replace cfn-hup from heat-cfntools. It
    allows pulling from multiple metadata sources and runs continuously.
    
    Fixes bug #1211289
    
    Change-Id: Ia4e9127fb79048bd1022b32a37272f8463a774ae

commit c7241b26e5356c1cedeb687d5066d5822c146777
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Aug 14 17:56:48 2013 -0700

    Make Resource names suitable for merge/include
    
    In nova-compute-instance.yaml, we need to use resource names that are
    unique within the entire set of resources that may be merged or
    included. However, we need the instance resource name to _match_ the
    one in overcloud-source.yaml so that its own access policies can
    function.
    
    Without this change we will not have unique users and Metadata access
    keys/policies for compute and controller.
    
    Change-Id: Iebde7e6adede4984f4f693cf2d57b6fadb8be558

commit 2334a8f0b2526aace63c74a7f58a5a8060d29487
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Aug 14 17:54:34 2013 -0700

    Fix missing NovaComputeLibvirtType parameter.
    
    Also change default to '' as null is not technically allowed as a
    string default in cloudformation (Heat accidentally allows this).
    Os-apply-config, via pystache, will still treat this as false for
    the purposes of checking if it is set or not.
    
    Change-Id: Ia02dbcf619bdc92647f1d21157fa4a8e3f749de3

commit 5e069fece4f9127265ef2e5d0a6df78a1bcdb145
Author: Robert Collins <rbtcollins@hp.com>
Date:   Mon Aug 12 23:51:22 2013 +1200

    Add ability to set overcloud hypervisor type.
    
    This is needed for non-nested-kvm capable environments.
    
    Change-Id: I2b87071941c04d3c99a687082db42d2a84f481fd

commit f31e4ce336bc304e14bc97a6b2e79aa1517ceb4e
Author: Robert Collins <rbtcollins@hp.com>
Date:   Mon Aug 12 22:41:35 2013 +1200

    Set a physical bridge for network nodes.
    
    The overcloud control plane needs to bring up an ovs bridge for the
    ovs plugin hot-plugging and floating ip logic to work. The previous
    in-instance script didn't migrate IP address and route information. We
    can do that by using the core ovs script we wrote for baremetal setups
    - triggered by setting the physical interface parameter.
    
    Change-Id: I6d6b09140ee751371607c0963dc76cc5b95f7674

commit 9d80bede79ab5fb2a65f620aec8601e6ad4a213c
Author: Robert Collins <rbtcollins@hp.com>
Date:   Mon Aug 12 20:29:14 2013 +1200

    Remove unused network configuration metadata.
    
    This is supplied to neutron etc via API calls - having it in Heat
    leads to having redundancy, confusion and tricky scripts. Incubator
    now has scripts to configure this and instances won't consult these
    keys.
    
    Change-Id: Ia45d9bf5bb326ec88f9f4a48c5520570cf5b6d72

commit f733956be86596f887ac0bee9b00f60c082ec608
Author: Robert Collins <rbtcollins@hp.com>
Date:   Mon Aug 12 20:24:26 2013 +1200

    Ignore built files.
    
    We don't want someone accidentally committing them.
    
    Change-Id: Iec4df61d3b7b1e1bd30f4cbba6b9991062758101

commit 15c91d8883865ab4d798e13b73e29102f1b4fee9
Author: Robert Collins <rbtcollins@hp.com>
Date:   Mon Aug 12 13:49:01 2013 +1200

    Increase PXE deploy timeout.
    
    Several users with slightly older hardware report the PXE deploy
    process aborting deploys that were progressing fine. By increasing the
    default PXE deploy timeout we should cater for this. A separate bug
    has been filed in Nova/Ironic about the timeout being too simple.
    
    Change-Id: I9e340fc7f928b32b1146ce758cda7180888d6cc9

commit 61a0528543c6d2f911dd301a11d8ef4d4aa7af59
Author: divakar-padiyar-nandavar <divakar.padiyar-nandavar@hp.com>
Date:   Thu Aug 8 07:57:43 2013 -0600

    Fixed merge code populating properties from yaml.
    
    Fixed merge code populating properties from yaml files which was
    setting only Type attribute for certain attribues related to Image
    For example, default value for notcomputeImage is populated properly
    in overcloud.yaml
    
    Fixes bug #1202884
    
    Change-Id: I9ea270dd19e9ebdb997be5d07b04ee2df28e3721

commit 94eb778d718877da2abfe2af22d6bccf01c45668
Merge: 257ebe0 dc23c47
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 16 09:42:32 2013 +0000

    Merge "overcloud-source: Fix overcloud parameters."

commit 257ebe03240f27158eb873d6982d525e44e3ae3c
Author: Robert Collins <rbtcollins@hp.com>
Date:   Tue Jul 16 14:23:49 2013 +1200

    Reinstate architecture binding for nova-bm.
    
    Per bug 1201656 (which this doesn't fix) nova-compute can only run one
    bm arch from a single compute host.
    
    Change-Id: I0eabe6e85ed388af111ef503882dfdf7959d8d97

commit 57706693ebdd4328f69db2ac462b56a9611b04d6
Author: Robert Collins <rbtcollins@hp.com>
Date:   Mon Jul 15 13:54:58 2013 +1200

    Stop passing no longer honoured keys in.
    
    The undercloud (and boot-stack in general) no longer create baremetal
    flavors or register baremetal ramdisks, so passing in keys for that
    isn't needed.
    
    Change-Id: I8c20e95f3a57418d7ae160a296a092cd71254e3d

commit dc23c472a2215c13676567c444db495f64be96f5
Author: Clint Byrum <clint@fewbar.com>
Date:   Fri Jul 12 14:52:14 2013 -0700

    overcloud-source: Fix overcloud parameters.
    
    These values were missed in the initial overcloud-source.yaml.
    
    nova.metadata-proxy is required to allow vms to communicate with the
    EC2-style metadata service.
    
    quantum.ovs.fixed_range constraints DHCP allocation for the undercloud,
    but in the overcloud we do not want this constraint because the individual
    subnets we define will do that. quantum.ovs.ovs_range configures the
    range of ips that can be assigned to the tenant subnets.
    
    Change-Id: If7191fa8baf1209ae33b9e8200f52ea0ade97810

commit 3af15362879ed990850d40af482d3ea56f8c0a3d
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Jul 10 20:40:37 2013 -0700

    Provide values for all nova compute params needed.
    
    Previously these would have to be set for overcloud at runtime, but we
    have good sane defaults now, and for nova-compute-instance we are able
    to feed them in using the appropriate references with Fn::GetAtt.
    
    Change-Id: Idfff2885bf2afa58b2dec84f06639198e411eae2

commit 793dd12964962cda1e939705ea47a1a29f21ca70
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Jul 10 14:17:06 2013 -0700

    Generate overcloud.yaml using overcloud-source.
    
    This new version does not need any nested stacks and correctly
    references notcompute.
    
    Change-Id: I16f846f7983a956b5159d17bef85cf6a87d69b45

commit 7ed33928b2cb67426f4a75ac45416309ee87f6d6
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Jul 10 14:11:11 2013 -0700

    Add an example of Type: FileInclude.
    
    Change-Id: Ie9d45ea5e26e38e8782e7a3d0a626e36090f5388

commit 4a43e6395db90c0e2a7bfd9a256fc312365da54c
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Jul 10 10:58:05 2013 -0700

    Add handling of parameter replacements.
    
    We will need to replace the use of Parameters in the included template
    with actual values in many cases.
    
    Change-Id: I95fc9116dc2bba74c31d5570851c5c4eb476291a

commit aebad8ce24f08042fa4814dd11761a9d15fae0a9
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Jul 10 10:44:36 2013 -0700

    Add FileInclude special type.
    
    We need to be able to combine pieces without uploading bits to an
    accessible URL.
    
    Change-Id: If0cec8ce7c77fed786d54dd0af2eb7823c088920

commit 36b4e49819c0e7121a618f30f0cdec034ce9050e
Author: Derek Higgins <derekh@redhat.com>
Date:   Wed Jul 10 12:53:44 2013 +0100

    Quantum -> Neutron rename
    
    Almost all references to quantum have been changed
    neutron in tripleo-image-elements.
    
    Change-Id: Ib17353d5834dd95d0348f62111074180c6e47181

commit ed2207820728f309383c9021c9f879d3ced5d486
Author: Robert Collins <rbtcollins@hp.com>
Date:   Wed Jul 10 15:04:50 2013 +1200

    Update boot-stack vm image for overcloud use.
    
    We now have an undercloud specific template, so we can use
    bootstack-vm specifically for the overcloud control plane.
    
    Change-Id: I06eb2b1d00e4d2211b632a06880aed51f01762ff

commit 13ae966069565a2a6f9406335f7720a7efd5c33f
Author: Robert Collins <rbtcollins@hp.com>
Date:   Wed Jul 10 14:59:02 2013 +1200

    Set a default image name for compute nodes.
    
    Defaults that match devtest.md will make adoption easier.
    
    Change-Id: I6b8c2b13cada5454ff52681451f9124b67ea44a9

commit d071b3dcc37958b32b16b1d09422e7299a1e83cb
Author: Robert Collins <rbtcollins@hp.com>
Date:   Wed Jul 10 14:45:48 2013 +1200

    Make merge.py output deterministic.
    
    The current code uses dictionary sort order which is defined as being
    an undefined order. Since humans review .yaml files having them sorted
    is a good thing.
    
    Change-Id: I43a31530bc042750448ac904c0c22f9a59b09b4d

commit 688a489021b0ca53c0aebfc7e843ddef5a922f6f
Author: Robert Collins <rbtcollins@hp.com>
Date:   Wed Jul 10 14:35:32 2013 +1200

    Refine the Makefile rules.
    
    The make rules in use were duplicative, which leads to maintenance
    headaches.
    
    Change-Id: Ic9e37796422caa2427c1575eb776c5d6a98516c3

commit 6529485a2af4075742dd23846a5fef68a9e8bd4c
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue Jul 9 10:38:03 2013 -0700

    Update bootstack-vm to match undercloud.
    
    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

commit 3c12e51a8470b43f50320316f9dd76617e2e8f11
Author: Clint Byrum <clint@fewbar.com>
Date:   Mon Jul 8 16:31:43 2013 -0700

    Update nova-compute-instance URL.
    
    Heat must download nested stack templates from a static URL. We
    have chosen a reasonable default, the official repository for
    tripleo-heat-templates.
    
    Change-Id: I9f8f1f3d3ec6492cf3891fab4fe793e05e703eb5

commit c1661002b078d77d4bdef1835b77537cab5416c1
Merge: 0c5bd2f 1da5280
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 8 19:47:31 2013 +0000

    Merge "Update undercloud-vm for new networking config."

commit 0c5bd2fc23f77c72da73f2d9b7baec4b0edfac6a
Author: Chris Krelle <nobodycam@gmail.com>
Date:   Thu Jul 4 07:42:52 2013 -0700

    Update nagios3.yaml to reflect changes to the postfix element.
    
    Recent changes to the postfix element added new parameters so
    the nagios3 template needed to updated to ensure postfix works
    as expected.
    
    Change-Id: I0a9eb8e0988470888f35adcc426ccd314f93b301
    Authored-by: Chris Krelle <nobodycam@gmail.com>

commit 1da5280d0c35082ae7ccfa12b283c56856cac53a
Author: Robert Collins <rbtcollins@hp.com>
Date:   Sat Jul 6 16:08:30 2013 +1200

    Update undercloud-vm for new networking config.
    
    It is currently broken due to mismatched config keys.
    
    Change-Id: If3ce934730cb974af7bcd7c6b3134e499f4e2a0d

commit 7633278ba440465be79e17bf05b85b2a4a75d0b5
Author: Derek Higgins <derekh@redhat.com>
Date:   Wed Jul 3 15:51:19 2013 +0100

    Remove reference to KeystoneLaunch
    
    This resource was remove in
    6504e6bd09b8b3b14ce56490ea3e17daf8cc0a93
    "Simplify keystone into one instance."
    
    Change-Id: Iea1502e4f00539abc4b8d04ea37e55c2133f7ae7

commit 5fd08e1bf064ee57aec440d738133b18fd7c75e6
Author: Robert Collins <rbtcollins@hp.com>
Date:   Thu Jun 27 15:44:08 2013 +1200

    A template for dev-test underclouds.
    
    Change-Id: Ibf59b34341129712c0e3187aa87ac90c092a74a7

commit ae28900681459076a0872f1c145f3f5b6dc84b2c
Author: Robert Collins <rbtcollins@hp.com>
Date:   Thu Jun 27 15:43:42 2013 +1200

    Ignore editor files.
    
    Change-Id: I2bf716cae119ccc8a4b4fa6fae4caa7444156526

commit bcebd6df604d20b8ce8cd60260941a055e95ca0f
Author: Robert Collins <rbtcollins@hp.com>
Date:   Thu Jun 20 15:15:09 2013 +1200

    Fixup https://review.openstack.org/#/c/33308.
    
    The local_ip value of 127.0.0.1 breaks clusters. Using 0.0.0.0 will
    have the right value when the heat-localip element is used.
    
    Change-Id: Id0da5d46c60e808944a40bcaf05f1072be55eed7

commit 5459cbd167e38a0b7c2d7fa0d72bedb68ce40bad
Merge: bbd0f5e a073f1c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 19 22:46:34 2013 +0000

    Merge "Remove references to Fn::GetAtt."

commit a073f1c3eb0842563321c903cd630abd7b81bb41
Author: Derek Higgins <derekh@redhat.com>
Date:   Fri Jun 14 00:16:34 2013 +0100

    Remove references to Fn::GetAtt.
    
    These were causing a Circular dependency error during the
    creation of a stack.
    
    Change-Id: Iccdf4a081f38aa3a5fe0e250b9e9382958a0f26e

commit bbd0f5ea08225dfedcc75e06ce8ac4695f126f13
Merge: be5577c 8805035
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 19 22:25:41 2013 +0000

    Merge "Fix default mysql usernames."

commit be5577cf0bc97a5eb2f964892e123d951a1b1c58
Merge: 6249969 20496de
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 19 22:23:37 2013 +0000

    Merge "Adding floatingip_start and floatingip_end to heat template."

commit 62499694574d39a67b8c53af43286c3f4bec561d
Merge: 324796f 88e264d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 19 20:03:14 2013 +0000

    Merge "Add sample template for nagios3 element."

commit 8805035dd0becfbeac67e3d540f2f1fe919002bb
Author: Derek Higgins <derekh@redhat.com>
Date:   Wed Jun 12 07:34:13 2013 +0100

    Fix default mysql usernames.
    
    Username heat looks like it got copy and pasted.
    
    Change-Id: I40666b8e80df7424e223b317ab4c9d6f614c43e6

commit 20496de7abff94b1e611c0cc5f9ceb9d3ecfbbad
Author: Derek Higgins <derekh@redhat.com>
Date:   Wed Jun 19 14:56:19 2013 +0100

    Adding floatingip_start and floatingip_end to heat template.
    
    These are needed by the quantum-network-node element
    
    Change-Id: Ic89b7f25752778aa2145768152bbc6e634ea3e5f

commit 88e264d3fda86784affe89a5e31fe2b910b63550
Author: Chris Krelle <nobodycam@gmail.com>
Date:   Wed Jun 12 14:41:33 2013 -0700

    Add sample template for nagios3 element.
    
    Change-Id: I02a80a371a8ca493f4e143def82215f33b29ac6c
    Authored-by: Chris Krelle <nobodycam@gmail.com>

commit 324796f7884cabda6e39e8d1c6e0157ce070887c
Author: Robert Collins <rbtcollins@hp.com>
Date:   Wed Jun 12 17:12:32 2013 +1200

    Parameterise more settings for nova and quantum.
    
    Change-Id: Ia35431302848666ad013adaeae1d06482cd3117a

commit 823ef3d4347354a0f31b90b51ddaad721e049fbe
Author: Robert Collins <rbtcollins@hp.com>
Date:   Wed Jun 12 14:01:23 2013 +1200

    Add .gitreview setup.
    
    Change-Id: I22855e7f3c77984ffc81ebf00e62cb78839e63a7

commit a96fefd92fd5ee80f83f0d6c16607c3c13627b8e
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu May 23 15:49:41 2013 -0700

    Nested stack of nova-compute-instance.yaml

commit 5eadb8b0add980ffe51a6e3acbba291ac6007184
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu May 23 15:48:15 2013 -0700

    New single instance nova-compute.

commit 7c9e46f4b816f58a53be913764a503e626ec3e12
Author: Clint Byrum <clint@fewbar.com>
Date:   Sun May 19 18:48:14 2013 -0700

    Adding bootstack-vm template.

commit b971d39d8ff9322a734922a829ba9a42c62297f5
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu May 16 20:13:03 2013 -0700

    PrivateIp is not assigned yet, plus 127.0.0.1 will work fine

commit 5f763d6efb34b581dc6f791fb0bda1fd262da863
Author: Cody A.W. Somerville <cody.somerville@hp.com>
Date:   Thu May 16 18:25:55 2013 -0400

    Fixed the nova-compute template.

commit 1536112575cb05d38ed17d5fd5a556f10fb7d371
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu May 16 16:10:20 2013 -0700

    Pushing passwords into mysql and other fixes.
    
    Generating and distributing usernames/passwords is just too complicated
    with Heat at this stage, so we need to push them into mysql from the
    template.

commit ca5b728ca0a2786ed250d6725d4f5a749204ed35
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue May 14 14:49:33 2013 -0700

    Hand modifying notcompute to work with elements.

commit f3760660331a188c486c9643896e6458ebc4c455
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue May 14 12:15:55 2013 -0700

    Adding username/password for Nova in notcompute.

commit 862bd3626bc375354d016196f57860a5216ba7fd
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Jun 6 09:32:50 2013 -0700

    Hand modified notcompute.yaml to work properly.

commit 4278478139b7307cc453184b03278e5ca6ed5039
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Jun 6 09:32:35 2013 -0700

    Remove unused NovaAPISize from nova-api

commit a0246928c7e395bfe4d25a397c415fab07892ad7
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Jun 6 09:30:59 2013 -0700

    Use slave roles in Makefile.

commit 022cc12afc82cbc9387a428d6ecc4a1f08979e9f
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue May 14 11:41:36 2013 -0700

    Add a Makefile for regenerating common merges

commit 3757db1f5b72388d5d4084e413b222b5d0294bf0
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue May 14 11:39:35 2013 -0700

    Removing unused TemplateURL

commit 4043c1d61b366c8572a753b9a0604793cb3af90e
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue May 14 11:35:36 2013 -0700

    Add glance heat and keystone to notcompute

commit a983dbb103b0353d7cdca53d7e594957f1cccce4
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue May 14 11:34:39 2013 -0700

    Make descriptions less redundant.

commit a808e90f0218925bd858a5c11ce6abc104c0fcf5
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue May 14 11:31:18 2013 -0700

    Adding OpenStack:: hints to engine

commit 6504e6bd09b8b3b14ce56490ea3e17daf8cc0a93
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue May 14 11:31:06 2013 -0700

    Simplify keystone into one instance.

commit 81ec285ee724f3efb5cc427dab2adc2181b81369
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue May 14 11:30:52 2013 -0700

    Add a smaller scale heat-allinone template.

commit b4113dc7ef843e5a08541cb1e861876a20e2e495
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue May 14 11:20:17 2013 -0700

    Add a 'notcompute' template.

commit d5e511f945152cc860640b5276272c50830e735d
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue May 14 11:19:43 2013 -0700

    Add ability to combine roles into one role.

commit 621a4dd9ca7029d1cc3bf46aa595f94d659479d5
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue May 14 11:02:51 2013 -0700

    Support DependsOn

commit 6defee322c98894b3229b2f32ef1f1e1695e77c1
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue May 14 11:01:53 2013 -0700

    Replace in AllowedResources

commit c7ef3cc3b0c0fdce4c2634fbcf855c1bc8fe5c44
Author: Clint Byrum <clint@fewbar.com>
Date:   Mon May 13 10:06:42 2013 -0700

    Create a utility for merging templates.

commit a9a7de4fcb1c7f80b365f20f5605bbc2de8f538a
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue May 14 10:56:25 2013 -0700

    Fix type-o in rabbitmq.yaml.

commit ece60fa2cc4b103ff350a71f08195f9019276b4d
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu May 9 17:44:37 2013 -0700

    Adding nova-api and finishing nova-compute split.

commit 121ac3b21c050f7684417788a21763f0622af4d4
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu May 9 17:34:46 2013 -0700

    Splitting nova-api and nova-compute.

commit 6a231fa76cb6e0d1df35bd03f2b830555d5a498f
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu May 9 14:55:07 2013 -0700

    Fixes for nova element changes.

commit 3046cbd8f34f89685ee7a635e6f7c2fcec8e7e68
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu May 9 17:47:40 2013 +0000

    Adding a (non-working) nova template.

commit 5210ca302efc84346223479454397fef4b524943
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu May 9 00:44:04 2013 +0000

    Fixes for quantum template

commit fa6a26d7946326680a5db4144958735ee7daf5cd
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed May 8 17:00:34 2013 -0700

    Add a template for OpenStack Networking (Quantum).

commit 2af825cf338595c4538543c572fbc2664c668a91
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed May 8 16:13:07 2013 -0700

    Add glance to mysql and base.

commit b4f7eae590bfea841db3099c4dba1160fb2f6d27
Merge: 07b90b6 600c10f
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed May 8 23:01:42 2013 +0000

    Merge github.com:SpamapS/templates
    
    Conflicts:
    	generic-user.yaml

commit 07b90b6e3b0f1346412493510fb878faf90c1cc1
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed May 8 22:59:09 2013 +0000

    Fix swift Metadata section.

commit edfbd862b3384795725beb4a01d6b0c8bf60430b
Author: Clint Byrum <clint@fewbar.com>
Date:   Mon May 6 21:50:09 2013 -0700

    Un-do all use of generic-user.yaml and remove it.
    
    This was a rather experimental way to try and create some generic
    templates in Heat. But the AllowedResources can only refer to resources
    inside the template itself, so this is useless.

commit 8be7b6b509afc3937f7d0656851d370f612b3860
Author: Clint Byrum <clint@fewbar.com>
Date:   Mon May 6 21:43:44 2013 -0700

    Cannot use generic-user.yaml, copy/paste in

commit 600c10f4c2463ad7a09ce78d0067de5d0ec86a10
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue May 7 04:32:36 2013 +0000

    Try List param again

commit 41e750482efcaeb67db2af011c7e4fd936e49ad4
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue May 7 04:15:56 2013 +0000

    CommaSeparatedList -> CommaDelimitedList

commit a25d96951683a56a908c8a79074945fbe4b83f70
Merge: a1a9df6 7a2a00f
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue May 7 04:10:57 2013 +0000

    Merge branch 'FIX-GENERIC'

commit 7a2a00f816f1c03d38a0e7463c935c2511683b84
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue May 7 04:08:00 2013 +0000

    Invalid Parameter type "list"

commit a1a9df62f6d7ef560e2d3883afb4e45ff444dd7d
Author: Clint Byrum <clint@fewbar.com>
Date:   Mon May 6 18:34:24 2013 -0700

    Fix yaml formatting

commit 7dd89392fb6a502229f12c7dedec14546ebcaa22
Author: Clint Byrum <clint@fewbar.com>
Date:   Mon May 6 17:55:08 2013 -0700

    Adding basic glance template

commit 72d250be0598aba3e9e9e09721cf99402ded0c91
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Apr 18 15:23:07 2013 -0700

    Refactor Heat template to use generic user

commit 41fb3c49045fd5dc6ae3ec013c51e8b8428d1fff
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Apr 18 14:04:06 2013 -0700

    Match Metadata with tripleo-image-elements.

commit 9954c0f5b2fda18757c2bcb5240c4b19da7dc69e
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Apr 18 11:19:43 2013 -0700

    Add Heat and RabbitMQ to base stack.

commit 67533a2d9dc87454ca2cbfe4778aa280e1a6392e
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Apr 18 11:17:08 2013 -0700

    Add stack for deploying Heat.

commit a15ca0394cb8427d11070ba6a0512b3e87ece833
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Apr 18 11:16:43 2013 -0700

    Add stack for deploying rabbitmq.

commit fcde46d7b178278aa2376fdc8f5427a30209561b
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Apr 11 09:47:28 2013 -0700

    Remove UserData, was workaround for Heat bug

commit 7877d912ced0141c3b0812aa9110d7b2d9f95297
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Apr 11 09:45:30 2013 -0700

    Specify the usernames for dump/root explicitly

commit 89662c8e67c285acfa5bdd167c71d5c9eff76e64
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue Mar 26 04:43:30 2013 +0000

    Refactoring to have a mysql-migration element.

commit 5cbb8d3a852d6360c3935d183e85ccb74e283ec6
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Mar 21 20:44:50 2013 +0000

    Adding functionality to mysql

commit ebbfa0a7ee541c636b86eca14cc0d0adfe9fed69
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Mar 13 18:43:28 2013 +0000

    works but missing stuff

commit 422b34354c6ce900eed7be85640430de5a494abb
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Mar 13 18:26:49 2013 +0000

    fixes

commit f1a1b301213d0156c3180cbe069cec1657c0a95c
Author: Clint Byrum <clint@fewbar.com>
Date:   Mon Mar 11 10:00:41 2013 -0700

    Adding bootstrap parameters

commit 4116aa5a5851e756437962abc1b1ba73eed812cf
Author: Clint Byrum <clint@fewbar.com>
Date:   Fri Mar 1 16:02:59 2013 -0800

    Refactor a bit around new thinking

commit 255232e2e1c13ce007649f3fff95c6c27229a556
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Feb 28 10:33:24 2013 -0800

    use openstack-db

commit 4c9a0549d411e63d2bbc90439b271e7c830a55c0
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Feb 28 10:28:57 2013 -0800

    Removing HA pair

commit a6e6afaa5a0bb98ce7862fcdae197357c127203d
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Feb 28 08:33:23 2013 -0800

    Adding keystone and mysql

commit a6889c1cd3d7776e5533bde5d187ce27a0d1af92
Author: Joshua McKenty <joshua@pistoncloud.com>
Date:   Tue Feb 26 07:55:24 2013 -0800

    Initial commit