commit 8c39eda54cae72049f06ada726c13cfe115268a9
Author: Robert Collins <rbtcollins@hp.com>
Date:   Wed May 28 16:26:21 2014 +1200

    Export new bootstack keys for cluster init.
    
    These provide a single consistent interface for checking whether
    a given node is the bootstrap node, or not the bootstrap node
    for database initialisation etc.
    
    Change-Id: I7c5a09cb3477b61c4050e4a47a680ffc9aee97d8

commit 9b7099a4b49cf68caa2ea54ef9d02a1ad640b257
Merge: db4d0a4 25f9f1e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 21 18:53:56 2014 +0000

    Merge "Use vip address where controller0 was used for endpoints"

commit db4d0a43a35a7729387c70a62bcf37dcb545640c
Merge: 28e9c8e 9d49401
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 21 13:06:42 2014 +0000

    Merge "Adding Swift proxy-server memcache metadata"

commit 25f9f1eda9b5b7564ead32b2cc027169c76bbb7b
Author: Dima Shulyak <dshulyak@mirantis.com>
Date:   Mon May 19 12:24:21 2014 +0300

    Use vip address where controller0 was used for endpoints
    
    This change is required to resolve scaling issue for
    OVERCLOUD_CONTROLSCALE > 1
    
    Basicly change affected all the places where endpoints
    were configured to use controller0 ctlplane ip address
    
    Change-Id: I76eb9d2b81d3ef5e9fae408f2432515f4de13e12

commit 28e9c8e83ef778b0ca41e5080d2abdb3e882268b
Merge: 46748fd 97be219
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 20 16:30:17 2014 +0000

    Merge "Configure NTP for overcloud compute"

commit 46748fdffb57960be79971b6466cc739e052591a
Merge: 5de81f8 e9c3d6f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 20 15:56:07 2014 +0000

    Merge "Specify group os-apply-config for config resources"

commit 5de81f897dcdbea2d54e563294dcd36c4a33e4cd
Merge: d9d4143 4e3fc26
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 16 12:44:25 2014 +0000

    Merge "Adding SNMPd auth credentials"

commit d9d4143d153672e8a76529c1d313c8b08e0ef030
Author: Dima Shulyak <dshulyak@mirantis.com>
Date:   Tue Apr 22 15:52:43 2014 +0300

    Introduce configurable virtual ip in templates
    
    added ControlVirtualIP resource of type OS::Neutron::Port
    
    Added ControlVirtualInterface - by default br-ex
    
    To specify the IP address to use as ControlVirtualIP,
    or for any others custom needs, you could provide:
    
    -P 'ControlFixedIPs=[{"ip_address" : "192.0.2.251"}]'
    
    Related to blueprint tripleo-icehouse-ha-production-configuration
    
    Change-Id: Ie82750ac1537c80311a869880f636bda59ca5c58

commit 5e5d633451474417217c4b2c87f6d817a98dd15b
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu May 8 08:33:01 2014 -0700

    Defer to element mysql.innodb_buffer_pool_size
    
    Choosing 100MB here is not a production default. We also don't need two
    places with the default value set. The closer a default is to the actual
    usage of it, the better, so we'll set 0 here, which will defer to the
    default in the element.
    
    Change-Id: I1b41b604286245c2fb83249778db835253c02fc5

commit 716b190be8843f46b5c3023298d3f31672854057
Merge: 7773f25 631e71e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 8 03:34:02 2014 +0000

    Merge "Add NeutronControlPlaneID parameter"

commit 7773f25759867a8807be21f9df1e58aaf8328e26
Merge: 3ea6b2c d6b5b1d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 7 13:11:17 2014 +0000

    Merge "Make size of loop device used by cinder LVM configurable"

commit 631e71e824aff933cd6fbd3540dbfdc7dded732d
Author: Dmitry Shulyak <dshulyak@mirantis.com>
Date:   Fri May 2 08:06:57 2014 +0300

    Add NeutronControlPlaneID parameter
    
    Creation of OS::Neutron::Port requires network_id parameter
    OS::Neutron::Port will be used for VIP creation
    
    Creating port for network by name, e.g:
    neutron port-create ctlplane
    works only with neutron cli
    
    Change-Id: Ia8bd6f700a4897efd277fd67189d2e04ad716b87

commit 3ea6b2cbe1ee70d60fa1ebcbf084b390aab8266c
Merge: f7663a8 d33a437
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 5 22:12:03 2014 +0000

    Merge "Increase PXE deployment timeout for overcloud"

commit 97be2198406de9caab6b71de148fc906c394fdb2
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Apr 18 17:04:54 2014 -0400

    Configure NTP for overcloud compute
    
    Updates the overcloud nova-compute templates so that
    the NTP server is properly configured.
    
    Change-Id: I4fc407153da5e031dcf5e5e5e1b3b74d932dba45
    Partial-bug: #1309677

commit e9c3d6f06b5577be4e2f91bf8f3ddbb06d913748
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri May 2 16:02:35 2014 +1200

    Specify group os-apply-config for config resources
    
    This will indicate to os-collect-config that this config
    resource represents os-apply-config configuration data,
    so it can only write out top-level config files for
    os-apply-config data (or Heat::Ungrouped for backwards
    compatibility).
    
    Change-Id: I3552fdd6df8106ab83cfd17d5f4b137cf33fbc36
    Related-Bug: #1299109

commit f7663a8973a508c8707b3a05621ac1d49eb6d627
Author: Robert Collins <rbtcollins@hp.com>
Date:   Wed Apr 23 13:23:15 2014 +1200

    Scale the control plane in hosts files.
    
    Being able to figure out the hypervisors from the control nodes seems
    useful, and equally all the hypervisors should know about all the
    control nodes (at least until we have virtual IPs all in place), and
    lastly the control plane need to know each other by hostname.
    
    Change-Id: I92877501c58d8c210e7b2c94935e107355271fb9

commit 4e3fc267a070366f678bbe7bcf0609c4a7f034cd
Author: Ladislav Smola <lsmola@redhat.com>
Date:   Fri Apr 25 14:06:46 2014 +0200

    Adding SNMPd auth credentials
    
    -Undercloud Ceilometer has to have access to SNMPd credentials,
     so it can poll the Overcloud nodes
    -In every Overcloud node, we need to set the same cretentials
     to SNMPd.conf
    
    Change-Id: Icf7c0c1772b6380b7136108e61c15cafe17274ba

commit d6b5b1d869739aefd7357a266566d1b3d0ecf09c
Author: Duncan Thomas <duncan.thomas@hp.com>
Date:   Thu Apr 17 13:28:05 2014 -0400

    Make size of loop device used by cinder LVM configurable
    
    This was hard-coded to 5 gig, which is useless for anything other
    than tempest runs and smoke testing
    
    block-storage-nfs.yaml has intentionally not been changed, since
    volume_size_mb is not used in that setup. Cleaning up that code will
    be done separately.
    
    Change-Id: I476b906a8d439d3e6643dd0c214965c5862418e8

commit d33a43761e87456d2ee9cf7fbf671a262dde8342
Author: Matthew Gilliard <matthew.gilliard@hp.com>
Date:   Thu Apr 10 09:39:21 2014 +0100

    Increase PXE deployment timeout for overcloud
    
    The PXE deployment often times out on baremetal deployment with >5
    overcloud nodes because the time being measured includes the
    dd of the image, which can be slow when many images are sent
    from the same undercloud host.
    
    Ideally we'd make the image sizes smaller, and/or make the
    undercloud cache the images more sanely.  It would also be
    possible to split the timout to measure dd-time and boot-time
    separately, but for now we just make the timeout configurable so
    a user can raise it if they have problems.
    
    Change-Id: I15540eec7a68eab4c9d128b65a95b1c0a2b64582
    Co-Author: nicholas.randon@hp.com

commit b8d42f54c6ca193d6b24162d01f3e0a56bd8c6e6
Author: James Slagle <jslagle@redhat.com>
Date:   Tue Mar 25 08:34:29 2014 -0400

    Expose dnsmasq options
    
    Adds a new parameter, NeutronDnsmasqOptions, to the overcloud template.
    
    Allows the ability to set dnsmasq options for neutron dhcp agent. This
    will allow us to configure mtu to be 1400 for tenant instances on the
    overcloud.  This should help with poor network performance and vm's that
    are just plain unreachable via ssh due to the GRE tunnel overhead.
    
    The default here has been set to:
    dhcp-option-force=26,1400
    
    This is the recommended way to configure OpenStack with the Open vSwitch
    plugin per:
    http://docs.openstack.org/admin-guide-cloud/content/openvswitch_plugin.html
    
    All the documentation I can find on the web (openstack-dev,
    ask.openstack.org, etc), recommend applying this setting. Others have
    reported slow vm performance as well, and this resolves that issue
    (apparently anyway...we'd need to test).
    
    Change-Id: If24326045987b5a484ba2f71f591092987966536
    Partial-Bug: #1270646

commit 439825b1b079d7bbf7f65f9c85f3adbed9ec204a
Merge: 5f74f5a b84513c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 22 19:20:08 2014 +0000

    Merge "Add passthrough configuration glue."

commit 5f74f5a5f84577446224c9f2c90c3a045e6a272d
Merge: be5af1a bbf98eb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 18 10:27:47 2014 +0000

    Merge "Adding undercloud ceilometer"

commit b84513c8d16cd19b57993575c6f54c9eda6f473f
Author: Robert Collins <rbtcollins@hp.com>
Date:   Wed Apr 16 16:08:45 2014 +1200

    Add passthrough configuration glue.
    
    This provides a means for users to pass configuration through to the
    machines they are deploying without us modelling that.
    
    Change-Id: I7134eb0c6be2d5cb1795b2f03cfba4afb69dc837
    blueprint: passthrough-config

commit 9d49401bdc08119dfbbeb1b50eea65e5a3f02e99
Author: Eamonn O'Toole <eamonn.otoole@hp.com>
Date:   Tue Apr 8 17:05:34 2014 +0100

    Adding Swift proxy-server memcache metadata
    
    Swift proxy-servers use memcache to store and share metadata. This
    change adds swift.proxy-memcache metadata to the swift-source and
    swift-storage-source yaml templates modelled on the existing
    swift.devices metadata.  This metadata will be consumed by the
    swift-proxy/os-config-applier/etc/swift/proxy-server.conf element
    if the metadata exists.
    
    Change-Id: If0b5724f69e7ec1c98e4dbdbeb9f08c4a18151b6

commit bbf98eb05368161c578071166c510d9f1070f3c2
Author: Ladislav Smola <lsmola@redhat.com>
Date:   Fri Apr 11 12:48:23 2014 +0200

    Adding undercloud ceilometer
    
    -adding Undercloud Ceilometer that will collect statistics
     about Overcloud nodes, via SNMP
    
    Change-Id: I1e90ad8d5bad16bc1c418ca2dbd78163abe6267c

commit be5af1a35e6bbb9e517fd953a5fe0e2467676b91
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Mar 19 15:16:32 2014 -0700

    Switch overcloud to software-config
    
    This migrates the overcloud to using OS::Heat::StructuredConfig and
    OS::Heat::StructuredDeployment. With those tools, we can decouple
    servers from software configuration and begin to deprecate features in
    tripleo_heat_merge.
    
    Change-Id: Ice85f0711e90d0fabf1d1bc4698201c4d6758508

commit a830cea3b1071f70485f427877ac4577f5d13e16
Merge: 64a616c 0223d35
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 11 18:50:53 2014 +0000

    Merge "Stop using notCompute in favor of controller"

commit 64a616c4267e663f2a51fcb29117734b2a7af87b
Merge: 101e7e9 d837c67
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 10 14:47:56 2014 +0000

    Merge "Adding NTP to undercloud template"

commit 0223d35c0cfe810a47a22df0a6aa5c858ccba335
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Mar 31 14:12:49 2014 -0400

    Stop using notCompute in favor of controller
    
    Updates all references for notCompute and notcompute
    to use 'controller' instead.
    
    Change-Id: I70ef83f35064ab388bdc7e1a6da62b6585580010
    Partial-bug: #1300324

commit 101e7e9be48e62f31b876a0d657b2c2ea27a565b
Merge: 15bbf5c 0acac15
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 8 14:33:25 2014 +0000

    Merge "Add mysql innodb buffer pool size"

commit 15bbf5cc26400c0012d4cc9a89dba92c0e50415a
Merge: 36b3d9e 2f50006
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 8 00:09:14 2014 +0000

    Merge "Allow setting the cinder iscsi-helper option"

commit 36b3d9edf5fecfaa592c52c41b14f3663847214a
Merge: 1a15a51 34c8378
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 7 20:31:32 2014 +0000

    Merge "Add enable_tunneling to swift storage metadata"

commit 1a15a519a0b24f1f71754f6369e8afad7d147fe9
Merge: 2e184b2 f4a7284
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 7 20:31:31 2014 +0000

    Merge "Add BlockStorage0Config Resource"

commit 2e184b20a1f1fae755c275fd256e37a9e99cf715
Merge: 6535156 f52b52c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Apr 5 10:29:31 2014 +0000

    Merge "Update templates to default to preserve ephemeral"

commit d837c677ee659559fb145670db8e34e96b587dd8
Author: Trent Geerdes <trent.geerdes@hp.com>
Date:   Fri Apr 4 12:43:16 2014 -0600

    Adding NTP to undercloud template
    
    Change-Id: I30c0e175fda448a300cae0b233757d31ce73402f

commit 34c83781f125ab8441668c724a878c1f00d882b6
Author: James Slagle <jslagle@redhat.com>
Date:   Thu Mar 27 11:02:41 2014 -0400

    Add enable_tunneling to swift storage metadata
    
    Add the enable_tunneling option to the neutron-openvswitch-agent
    metadata for the swift storage template. If not preset, this option is
    left blank in the openvswitch plugin configuration plugin. This causes
    the service to fail to start because a blank value is not permissible
    for a boolean option.
    
    Change-Id: Ieadcdab295913121bd00dbd25e4245024bc2240f

commit 0acac15f4ead9e5c6bec98411bbdda21f876d582
Author: Jan Provaznik <jprovazn@redhat.com>
Date:   Tue Apr 1 06:53:38 2014 -0400

    Add mysql innodb buffer pool size
    
    Innodb buffer pool size in mysql config file is now set to 592M,
    this value is for VMs with 2G RAM too much. This patch makes the
    pool size configurable and decreases default value to 100 MB
    (this should be sufficient for default devtest setup). A patch which
    for tripleo-image-element which sets this value in my.cnf will follow.
    
    Change-Id: I0d2529abe51d4dc34415bf6c40da7a267bf3e65b

commit 2f50006b5bdf0d2f84f806e9d9c7f0dc5ab656e6
Author: Ben Nemec <bnemec@redhat.com>
Date:   Wed Mar 5 17:51:25 2014 -0600

    Allow setting the cinder iscsi-helper option
    
    This is necessary to support iscsi helpers other than tgtadm, such
    as lioadm.
    
    Change-Id: I8a63872185f73372fcf6c90d3dde31e5bb0a168b

commit f4a7284641048c64deb83c8e3dabb79c19ed0ad0
Author: James Slagle <jslagle@redhat.com>
Date:   Thu Mar 27 11:00:28 2014 -0400

    Add BlockStorage0Config Resource
    
    Add a BlockStorage0Config resource in the block-storage.yaml template.
    This was missing previously and was causing the behavior of having all
    block storage nodes only being created after all other nodes were up in
    a deployment (I presume b/c of the wait conditions).
    
    Also, we need the BlockStorage0Config resource so that we can get the
    configuration of neutron-openvswitch-agent from the metadata, previously
    the values in the file were unset, causing the service to fail to start.
    
    Change-Id: I297de24079d1ece66d35213b4ef1f2c8c50e73f0

commit 65351560a421f40c0d66d6dcb00ee5515d5feb0f
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Mar 26 12:42:01 2014 -0400

    Drop dnsmasq_range from the undercloud source.
    
    We don't make use of dnsmasq_range anywhere so lets remove it.
    
    Change-Id: Id3e14aee8a9f720a09bc2c8ace99e06c4a2d09a9

commit f52b52cadfb70b7dc808a22e3566954ac8e7829c
Author: Cian O'Driscoll <cian@hp.com>
Date:   Wed Mar 26 11:18:27 2014 +0000

    Update templates to default to preserve ephemeral
    
    Updated heat templates to default to preserve ephemeral partition
    on a heat stack update. Allows undercloud and overcloud to be
    re-imaged/updated and state preserved.
    
    Change-Id: I6626af48d8c55672022a46fe48e5725ad2619f0c

commit 06b199e889e86c120aa270c95db09adf349b2213
Merge: e5aa2ec 948fc78
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 26 09:38:58 2014 +0000

    Merge "Remove unnecessary cinder metadata"

commit e5aa2ec94a52b21cef5e0151406e2505c353344f
Merge: 2817287 e1822eb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 26 03:11:14 2014 +0000

    Merge "Adding image update policy to undercloud template"

commit 2817287d36d8ceed637a9dd603067b858f3dde65
Author: Robert Collins <rbtcollins@hp.com>
Date:   Mon Mar 24 17:23:40 2014 +1300

    Fix Ironic templates
    
    The merge of ironic-source wasn't actually merging, leading to bad
    templates. As part of this add the needed SSH virtual power key
    (because like nova-bm, Ironic requires that for now).
    
    We also need to set the compute_manager for nova with Ironic, so that
    gets set too.
    
    Change-Id: I0d7d535dbac3584b3eb12865259ee6403e20c98f

commit 7ded3131bda05989e35a06c06b8a51f8f324e344
Author: Allison Randal <allison@lohutok.net>
Date:   Wed Mar 19 08:00:33 2014 -0700

    Pass undercloud metadata to overcloud compute
    
    Capture some undercloud metadata into the overcloud compute
    configs, so the overcloud nodes can pull updated images from
    the undercloud glance. Unset by default, but able to be set
    during stack-create or stack-update.
    
    Change-Id: I2997d23c584055c40034827e9beb58e6542ea11c

commit e1822ebdd13768cbd9dc82bbd475a2bb722ee3c5
Author: Cian O'Driscoll <cian@hp.com>
Date:   Fri Mar 21 10:46:18 2014 +0000

    Adding image update policy to undercloud template
    
    Allows image policy to be specified when updating the undercloud
    stack. This enables the preservation of persistent ephemeral disks.
    
    Change-Id: Id7bc0a72ae1737d2fdadb3f47006bd0cfb0bc42f
    Closes-Bug: #1295616

commit b8ba27916819e3e805c76be69f251a04be227e29
Merge: b134483 ec24b7e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 17 10:21:02 2014 +0000

    Merge "Change nova compute driver location"

commit ec24b7e40553f425ec83d2093a87355e805a2b11
Author: Chris Krelle <nobodycam@gmail.com>
Date:   Fri Mar 14 08:10:15 2014 -0700

    Change nova compute driver location
    
    This patch changes the location of the Ironic Nova compute driver
    in nova.conf so that it uses the driver from within the Ironic
    directory tree. This patch will need to be reverted once the Ironic Nova
    driver lands in the nova.
    
    Change-Id: I9199d506f3665cb0827edd642a1806713a42b90e

commit 948fc78c9b199ac429842fd038957b5c197458ed
Author: Ryan Brady <rbrady@redhat.com>
Date:   Fri Mar 14 11:03:02 2014 -0400

    Remove unnecessary cinder metadata
    
    Previously all cinder functionality was in a single element and
    required "volume: 'true'" to install the cinder-volume service.
    Now cinder has been split into multiple elements and you build
    an image with the cinder-volume element to achieve the same goal.
    
    This patch removes the "volume: 'true'".
    
    Change-Id: I2ed2e6f7c7db7619aee7ce4ba730f310344e0b0e

commit b134483627fa21af4788402b2ca984c17a48afe9
Author: Ryan Brady <rbrady@redhat.com>
Date:   Thu Mar 13 13:15:21 2014 -0400

    Add Wait Condition to Block Storage Templates
    
    In some environments the heat stack-create command would complete
    even though the block storage node would still be in a
    build/spawning state.  This patch adds a wait condition to ensure
    the block storage node has a chance to complete and the stack-create
    command to complete properly.
    
    Change-Id: Idb524625b8d6df1ff6f927c22b72bc6d3d611686
    Partial-Bug: #1290764

commit 0490dd665899d3265a72965aeaf3a342275f4328
Merge: 78eb968 a7ea8ec
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 13 00:30:55 2014 +0000

    Merge "Add heat.stack_domain_admin_password"

commit 78eb968d15d593db40e6ff8270d9f1968625e364
Merge: 74ef0fc 3ece987
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 12 18:01:37 2014 +0000

    Merge "Merge Block Storage into Overcloud"

commit 74ef0fc810cdbc3d1e0832665de50caac235ac38
Merge: 6d2580f 640f7e2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 12 16:24:18 2014 +0000

    Merge "Remove Duplicate Rabbit Parameters"

commit a7ea8ec32beb8e58bbcb6c5bd327bf718161b5a5
Author: Clint Byrum <clint@fewbar.com>
Date:   Tue Mar 4 13:31:01 2014 -0800

    Add heat.stack_domain_admin_password
    
    This new parameter will be used to configure Heat for the new required
    stack domain admin.
    
    Change-Id: Ieace33154a14f472aab8ac76b2b876db77230110
    Partial-Bug: #1287453

commit 6d2580f037b843fd7f663f02113b5d924f0bafb8
Merge: c609ce4 30301f3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 12 08:05:44 2014 +0000

    Merge "Swift storage heat templates"

commit 640f7e2d8b6a2d43fa5e04c7424d98e508d317e4
Author: Ryan Brady <rbrady@redhat.com>
Date:   Tue Mar 11 20:06:54 2014 -0400

    Remove Duplicate Rabbit Parameters
    
    This patch removes the duplicate rabbit username and password
    parameters.  These parameters cause a conflict when running
    merge.py because they already exist in the overcloud template.
    
    Change-Id: I01d386577734c7c516a477e1e402882294ac4376

commit 3ece9870f6f479779f60d0df288dcf7f765416f7
Author: Ryan Brady <rbrady@redhat.com>
Date:   Tue Mar 11 11:56:29 2014 -0400

    Merge Block Storage into Overcloud
    
    This patch removes the seperate overcloud-with-block-storage.yaml
    make target and merges the functionality into the main overcloud.yaml
    target.  The default BLOCKSTORAGESCALE is 0. Change this number to add
    additional block storage nodes.
    
    This patch also updates the overcloud-with-block-storage-nfs target
    to more closely resemble the overcloud.yaml target, including swift
    and ssl templates as needed. The default BLOCKSTORAGESCALE is 1.
    Change this number to add additional block storage nodes.
    
    Change-Id: Ifcc733cfbf9f356393c3f6c72b2bbbb0214d3040

commit c609ce4c7cc0df8200af38c01377f4dfdc9620bc
Merge: a260203 db8f15a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 11 05:51:41 2014 +0000

    Merge "Add rabbit.cookie attribute"

commit 30301f322f91d9e9e786106d8fe6b270600f8672
Author: Richard Su <rwsu@redhat.com>
Date:   Wed Mar 5 14:58:22 2014 -0800

    Swift storage heat templates
    
    Updated the existing swift-source template to properly list all
    swift devices.
    
    Created a new swift-storage-source template to add additional
    swift-storage only nodes.
    
    The default SWIFTSTORAGESCALE is 0. Change this number to add
    additional swift storage nodes.
    
    Change-Id: Ia05f4ad44593316430d60541106d23b032c3e760

commit a2602039fc66891bb9d08dbd5963c9968e1a8ee8
Author: Ryan Brady <rbrady@redhat.com>
Date:   Thu Feb 20 07:40:31 2014 -0500

    Adds block-storage-nfs template
    
    To support the changes to the cinder element to allow the nfs
    backend to be utilized, this template has been added to show
    the usage of the nfs_shares key in the cinder metadata.
    The value is a list of strings containing share addresses.
    
    This change is added to facilitate an example to test
    the cinder element change: https://review.openstack.org/#/c/74563/
    
    You may setup the nfs server manually or use the nfs-server
    element at https://review.openstack.org/#/c/74712/.
    
    Change-Id: I5b6cb118b34421ea07a81ed1fe68db24b1d4f19d

commit c12483397cd1483ebe09a422477ac42a32bd9005
Merge: e533f2a 1879dc0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 6 01:45:46 2014 +0000

    Merge "Fix Merge::Map for scatter-gather in Configs."

commit e533f2ac2c9faf18ff1c612722bf38ef37158c46
Merge: fa06cba 9df35c1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 6 01:45:46 2014 +0000

    Merge "Add a check target."

commit fa06cba2e40e84133452673728ca208348bb64a6
Author: James Slagle <jslagle@redhat.com>
Date:   Wed Mar 5 15:51:57 2014 -0800

    Fix bad indentation
    
    Lines for notifier-strategy and log-file had 1 level too much of
    identation causing an error in the available metadata.
    
    Change-Id: I559855887349bf2bbab87788ef9baa216bde60d8

commit 1879dc0800e8015e201f4698c1214a0e525f7ee3
Author: Robert Collins <rbtcollins@hp.com>
Date:   Thu Mar 6 11:01:50 2014 +1300

    Fix Merge::Map for scatter-gather in Configs.
    
    When Merge::Map was used like so:
    
    NovaCompute0Config:
      Merge::Map:
        NovaCompute0:
          Fn:....
    
    We were adjusting the inner NovaCompute0 to the current scaling loop
    position rather than exploding it out as part of the map. For now, we
    want maps to be global in context so the fix is fortunately simple.
    
    Change-Id: Ibea723d4c763f593d934a9d2acfd31ce369f6408

commit 9df35c186f14d3b3b76a3946981ad6ec5cf9336f
Author: Robert Collins <rbtcollins@hp.com>
Date:   Thu Mar 6 10:41:21 2014 +1300

    Add a check target.
    
    Just developer convenience - I'm used to autotools 'make check'
    environments.
    
    Change-Id: Idf5bb882f798d22d4513756b5273d4ae19caa5c0

commit 1f75fd8fd3086febb5ac37cb921fa82eb2cc8c8e
Merge: a551656 4991584
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 5 10:53:18 2014 +0000

    Merge "Add GlanceLogFile and GlanceNotifierStrategy"

commit a5516561a6dda085e641c807caa83abae3556bf2
Merge: 9f44208 dcfbcb6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 5 09:29:37 2014 +0000

    Merge "Make Wait Conditions depend on config creation"

commit dcfbcb6442cf8bcaf08091a32f6e3d753e4439f9
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Feb 26 14:27:24 2014 -0800

    Make Wait Conditions depend on config creation
    
    Currently our wait conditions are racing with Heat resolving
    configurations. There should be plenty of time but sometimes Heat may
    be dealing with a temporarily problematic Nova API and spinning on that.
    While that is happening, the in-instance tools will not have their full
    configuration available to them. We don't want the wait condition timeout
    to start until the box has had its actual config exposed to it.
    
    Change-Id: I0eab8fe7547d3cbcebb1559fd3d06206b1750e96

commit 49915844e0c709ab05e1c882eb5936d810850a94
Author: James Slagle <jslagle@redhat.com>
Date:   Wed Feb 26 15:53:17 2014 -0500

    Add GlanceLogFile and GlanceNotifierStrategy
    
    Expose 2 new parameters to control glance configuration:
    - GlanceLogFile
    - GlanceNotifierStrategy
    
    This will allow the glance configuration options log_file and
    notifier_strategy to be set in glance-api.conf and glance-registry.conf
    
    Change-Id: I1af1ecfdfe0859f2baba4579aab6e947a2a54308

commit db8f15a27d16c30e31e0855d415b597eb292983b
Author: Jan Provaznik <jprovazn@redhat.com>
Date:   Thu Jan 30 17:16:18 2014 -0500

    Add rabbit.cookie attribute
    
    All nodes in rabbitmq cluster should have same cookie. This patch adds
    default random cookie to existing templates.
    
    Change-Id: I6579089bd95b0169db20635479e077f3ecade8e2

commit 9f4420800947b9f9860962edf9217934dc8012f3
Author: Ladislav Smola <lsmola@redhat.com>
Date:   Mon Feb 24 10:04:52 2014 -0500

    Different Flavors for Tuskar roles
    
    - different Flavors for control, compute and storage nodes
    - for devtest use, they default to 'baremetal', so nothing
      changes
    - for Tuskar, there is a possibility to have them different for
      every role
    
    Change-Id: I8c1b80f55a91c7a7fd5e560ccdb8da82ec374084

commit edf87127836805197d2d67c6c2addcdab60c1b7a
Author: Robert Collins <rbtcollins@hp.com>
Date:   Fri Feb 21 14:25:51 2014 +1300

    Fix the hosts setting - nova uses novalocal.
    
    Not '.local'. Doh.
    
    Change-Id: I61ac6e5d6dfefcfe8c78618f6fc5d4c2c61831f0

commit 93eaca0e24c58c86882a91eec40aec0cdb417a01
Author: Robert Collins <rbtcollins@hp.com>
Date:   Thu Feb 20 18:26:22 2014 +1300

    Gather all hypervisor names into /etc/hosts.
    
    Nova compute uses hostnames to do live migration, so we need this, or
    DNS, and for now this is simpler, as we don't have Designate available
    in the undercloud.
    
    Change-Id: Idf0b106c5fbe60680b23a730eb37619a3d796869

commit 70494ab2cb75e7f7ca83a169eac823b22eb6e180
Author: Robert Collins <rbtcollins@hp.com>
Date:   Thu Feb 20 17:14:43 2014 +1300

    Add a Merge::Map feature.
    
    We need to scatter gather in a few situations - determining rabbit
    cluster membership, galera membership and configuring hosts for Nova
    to permit live migration (which requires host->host communication).
    This patch is a proof of concept for an eventual heat feature,
    expressed in merge.py. The example given should work for actual use,
    but I'll deliver that change separately.
    
    Change-Id: I68e9b2471866810cc698ca3ea28ddf5bb1688d7b

commit 8403b8ae9fd7eef452fe7cd96df814e195fea916
Author: Robert Collins <rbtcollins@hp.com>
Date:   Thu Feb 20 15:50:01 2014 +1300

    Fix tests.
    
    We're not gating yet - this skew crept in.
    
    Change-Id: I97b064f6d0cb75bf80b423951101687b6d26d90c

commit b6ee51161e77dcbe61de3365052039865742a7a0
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Feb 20 15:40:01 2014 +0000

    Remove uses of functions in parameter defaults
    
    This doesn't work in recent versions of Heat and it shouldn't really
    have ever worked.
    
    Change-Id: I60772173f8d5baa5768b5626266b2e61cd93fbe2
    Closes-Bug: #1282594

commit ff0959a200cfad26d0c688bf293e3ebeb365ff48
Author: Richard Su <rwsu@redhat.com>
Date:   Tue Feb 11 15:52:37 2014 -0800

    Add username parameter for rabbit
    
    Username is currently assumed to be guest in the configuration
    files. This change makes it more explicit.
    
    Configuration files in tripleo-image-elements will be updated
    to use this parameter in an upcoming patch.
    
    Change-Id: Ia176f4d573a3a293560c72236a4181befa678301

commit 5577ae61ecc1799e49f80b551104a28f00d0bf89
Author: Derek Higgins <derekh@redhat.com>
Date:   Thu Feb 13 21:22:37 2014 +0000

    Fix typo in undercloud-vm-source.yaml
    
    There is no NoEcho type.
    
    Change-Id: Id652b80f394a0d0b9e4b83ca9a61d2b547a14c3e

commit 54e15b20b32c26386d429555fed6b5f69409e18b
Merge: 28d5a20 8ed3b1f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 13 21:07:09 2014 +0000

    Merge "Support TripleO-CI for overcloud builds."

commit 28d5a2017ef61c06790c740f7fae3455873f52a9
Merge: 4d352da 679ed90
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 13 21:07:09 2014 +0000

    Merge "Allow manual hosts entry exports in overcloud."

commit 8ed3b1f403da045b764a3e8865b59117a704e331
Author: Robert Collins <rbtcollins@hp.com>
Date:   Thu Feb 13 11:03:56 2014 +1300

    Support TripleO-CI for overcloud builds.
    
    For Tripleo-CI we can't generate the key in the VM and hand it out,
    because we have restricted access to the machine. Plus, this has been
    ugly forever. Pass an SSH key in, rather than pulling one out.
    
    Change-Id: I1def0757758e30e63891ff099106dac158bd8d83

commit 4d352dabfbc337dd53ac07365c5e6c191f070d9b
Merge: f0e61d1 70807d7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 13 19:11:24 2014 +0000

    Merge "Add a debian-mirror heat template"

commit 679ed909ce3d9be1eef39e4afa5a559a40b26363
Author: Robert Collins <rbtcollins@hp.com>
Date:   Fri Feb 7 15:57:07 2014 +1300

    Allow manual hosts entry exports in overcloud.
    
    This makes it possible to have SSL connections to APIs from compute
    hosts with no DNS or external connectivity - something the
    ci-overcloud has.
    
    Change-Id: I089ef8fdfb4a59279f09bf3cd2a4474000e4bfa6

commit f0e61d11fc949cb9ebc3d2b875fdb79335ed0d33
Author: Robert Collins <rbtcollins@hp.com>
Date:   Fri Feb 7 15:37:45 2014 +1300

    Make it possible to do physical networks for VMs.
    
    This patch makes it possible to setup physical networks for VMs,
    separate to the control plane configuration which is needed for
    routed/natted access to physical networks.
    
    Future work is needed to automate ci-overcloud configuration of the
    control plane where we need two distinct bridges, but this is enough
    to stop folk dying of boredom setting up a sizeable ci-overcloud.
    
    Change-Id: I6ac7129f22bb797467adb0408638781d20081f19

commit 7337f851bac1a808bc134f4db459b620063fbc0c
Author: Robert Collins <rbtcollins@hp.com>
Date:   Wed Feb 12 07:59:58 2014 +1300

    Permit overriding the undercloud controller ip.
    
    Currently we infer the controller IP address from Neutron, but when
    we get HA, the controller address may move around so would need to
    be the floating IP. Equally, folk doing unusual sets may need to
    have the IP address be something other than what the seed Neutron
    handed out.
    
    Change-Id: I97441d009b831fd7356a6c58f4c9edc7532f7d05

commit 6057a369b881e29089321430579588b2aac5005e
Author: Dan Prince <dprince@redhat.com>
Date:   Sat Feb 8 16:55:20 2014 -0500

    Drop PowerUserName from overcloud-source.yaml
    
    This parameter is only used for underclouds... no need
    for it here.
    
    Change-Id: I8cfda18ef4c9d7aa20fca7f1ba596541c3aad1ac

commit 930163894204ab0b64e8830a4e91645c8e3acc9e
Author: Robert Collins <rbtcollins@hp.com>
Date:   Tue Feb 4 13:07:03 2014 +1300

    Support neutron.flat-networks in overclouds.
    
    This is needed to allow configuring the template in
    I9fa923b63033edb694720bfe5fc756a7c0fbfd2a.
    
    Change-Id: I65810db156cb3d93291ac56fcf96e3ed2c87e1b2

commit 1fbf8ac0dc7469b3c8fff538ecf9e883e83332a6
Author: Robert Collins <rbtcollins@hp.com>
Date:   Tue Feb 4 12:59:54 2014 +1300

    Make make overcloud.yaml DTRT always.
    
    Change-Id: I3aebf49c87434026b9eea9de9a67cb3196bc48b2

commit b047f27493ad6403745bd61a2f25eba0c4405a0f
Merge: f9ef457 4f423ed
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 3 01:13:20 2014 +0000

    Merge "Remove InstanceType and ImageId from cinder template"

commit f9ef45798719254ce66b6374c5f803b04ec86721
Author: Clint Byrum <clint@fewbar.com>
Date:   Fri Jan 31 11:05:09 2014 -0800

    Remove image parameter changing from merge
    
    The merge tool originally was meant to merge somewhat different things,
    and thus this was helpful in the early versions. However, at this point
    we want parameters to be more stable and we don't generally merge things
    that have their own image parameter.
    
    Meanwhile this feature caused problems as we change resource names.
    
    This is a backward incompatible change of default behavior, but the old
    behavior can be had again by passing --change-image-params.
    
    Change-Id: I78cf31f0443f3d9f274758f5471a5bca9155635d

commit 70807d77ee33db3958534999d4e8651c6272a348
Author: Steve Kowalik <steven@wedontsleep.org>
Date:   Thu Jan 23 13:01:02 2014 +1100

    Add a debian-mirror heat template
    
    Populate defaults for the debian-mirror image-element using a heat
    template.
    
    Change-Id: I28de1d04be7292dad1bc448ff8bbde634cebd6f3

commit 6027346b9bcf7c8c4a4f91dbead6c42d2fefdd3d
Author: Robert Collins <rbtcollins@hp.com>
Date:   Fri Jan 31 11:01:45 2014 +1300

    Remove file injection config option.
    
    We're just forcing it off now that the seed is Neutron based.
    
    Change-Id: I3ebc1454aba9d2c2587628f9cded6e0f445f3606

commit 4aff0fb3f718ee0e55f39f5d0663feb22a14e9a3
Author: Robert Collins <rbtcollins@hp.com>
Date:   Wed Jan 29 13:29:49 2014 +1300

    Prep work for a scalable control plane.
    
    This is complete as far as it goes but it isn't enough to make running
    a scaled out control plane actually work. Specifically, the constructs
    to point at API hosts based on looking up a network address aren't
    suirtable for scaled out - we need to be using the virtual IP or DNS
    round robin or other such resilient configurations, but that is
    largely / entirely orthogonal to making the template be ready for
    scaling.
    
    Change-Id: Ib9e6db5e7d5db84e4746afdabea046d2b8702bbb

commit 9ffb18af9421070fffb9375f1fc5e4c94ede0fde
Author: Robert Collins <rbtcollins@hp.com>
Date:   Tue Jan 28 19:39:43 2014 +1300

    Update overcloud to support N compute hosts.
    
    This uses the new merge feature earlier in this series.
    
    Exporting COMPUTESCALE before running make will build a different
    template. Note that since Make doesn't depend on variable values, you
    need to delete overcloud.yaml between building with different scales.
    
    Change-Id: If05b99ae3596bcc794e3a899ab1443aeb14ec754

commit 8f842e60bf1f7c85b4ff403263076e3284b22b8a
Merge: cd9fce9 c071255
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 30 02:43:53 2014 +0000

    Merge "Make scaling out a feature for merge.py."

commit cd9fce908620ccf372806a48ac9e31ebbc812d02
Merge: e174686 23c8aac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 28 23:01:34 2014 +0000

    Merge "Make debugging merge.py in the test suite possible."

commit e174686162feb1155f2b01b5fd0f399b197b87b4
Merge: 1d59167 0757603
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 28 22:17:30 2014 +0000

    Merge "Permit writing output to other than stdout."

commit 4f423ed6aec34a2f4274cd48d20dccb6080f6068
Author: marios <marios@redhat.com>
Date:   Tue Jan 28 16:38:52 2014 +0200

    Remove InstanceType and ImageId from cinder template
    
    InstanceType and ImageId properties belong to an
    AWS::AutoScaling::LaunchConfiguration, for example as used for
    NovaCompute0Config in nova-compute-instance.yaml. However this
    template doesn't use a LaunchConfig but params instead. AFAICT
    we don't need these here (and they cause HEAT template validation
    to fail)
    
    Change-Id: If444e4449e3d62cb954de48bc3b55b16dcc8886f

commit c071255ad6bf1fb2c9db6799e96b509295f53fc9
Author: Robert Collins <rbtcollins@hp.com>
Date:   Tue Jan 28 19:20:40 2014 +1300

    Make scaling out a feature for merge.py.
    
    This is a simple implementation designed to work with our current
    non-HOT approach. We need to adjust our templates a little to support
    this - though future work could make that better, it's orthogonal to
    this effort.
    
    Change-Id: I555617e5f24a5882de915f057dc02e008c81e753

commit 23c8aac2bacfee96e0faedb84d0b72893f13c6ec
Author: Robert Collins <rbtcollins@hp.com>
Date:   Tue Jan 28 19:19:16 2014 +1300

    Make debugging merge.py in the test suite possible.
    
    Change-Id: Ie30f0421601cbd5cf8f88dcc3dcf818b1db589ba

commit 0757603f2ec10223a99de17123cfd9c1a6a815af
Author: Robert Collins <rbtcollins@hp.com>
Date:   Tue Jan 28 19:18:57 2014 +1300

    Permit writing output to other than stdout.
    
    Change-Id: I8349f347578bab564e4c37ee2c87314881e09b01

commit 1d591672fb8dcb4afed8fac2910956348005a43e
Author: Clint Byrum <clint@fewbar.com>
Date:   Sat Jan 25 22:13:48 2014 -0800

    Allow setting a single NTP Server
    
    We can allow multiple later when we have better tools for such things.
    
    Change-Id: Ie902843c28f8a7258b207745653184784e3e9665
    Partial-Bug: #1184486

commit 6cecaac6a3257d422568f25c3b832c347a98ff92
Merge: 8ad2409 c411d22
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 24 23:18:31 2014 +0000

    Merge "Use OS::Heat::UpdateWaitConditionHandle"

commit 8ad2409ddb7ffe3e2d0d7fa3a25bdda791cc6978
Merge: 01fe17f 0e96103
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 23 21:34:52 2014 +0000

    Merge "Expose bridge_mappings in the overcloud."

commit 0e961035a036a00c73768aecb88b9ce7a1acc9a7
Author: Robert Collins <rbtcollins@hp.com>
Date:   Fri Jan 17 23:16:06 2014 +1300

    Expose bridge_mappings in the overcloud.
    
    Some overclouds will want physical networks to be accessible by VMs,
    and this is a component of that.
    
    Change-Id: I5f65c040526f785b4e976f87980d94588b3fb63c

commit 01fe17fe1ba0f5d43d14890dc3b7fc0150f67ac8
Merge: 5569d09 e5d4ce3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 22 04:21:37 2014 +0000

    Merge "Add SSL configuration metadata for overclouds."

commit 5569d09be2b1197b3b0a4fea7f8ce197231ee6e7
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Mon Jan 20 11:57:50 2014 +0100

    Add license file
    
    Change-Id: I6f1807b2c4f3ec8bc0b181015997516c692fafee

commit 6200c9f4847e2823ff91880888aba485461f3242
Merge: 9e75c7e d023604
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 17 09:20:43 2014 +0000

    Merge "Add optional cinder storage node to overcloud"

commit c411d229428cd9b369fd3cf7380d17795d6cde24
Author: Clint Byrum <clint@fewbar.com>
Date:   Thu Jan 16 18:12:57 2014 -0800

    Use OS::Heat::UpdateWaitConditionHandle
    
    This alternate wait condition handle is used to make updates wait for
    signals from all parties to signal they're ready.
    
    This change will not work until the following Change Id lands in Heat:
    
    Ibfadc6f9c436ce3d0f468a4e5560233f762038dd
    
    Change-Id: Id11b5c79df5f41e49f1bf3c860e414204a242293

commit e5d4ce3c5f1ff04e1d0910508fa3cf101893d3e6
Author: Robert Collins <rbtcollins@hp.com>
Date:   Fri Jan 17 14:17:00 2014 +1300

    Add SSL configuration metadata for overclouds.
    
    This passes SSL keys in via Heat which places a high cost on heat
    compromises or the use of a non-SSL heat to do deploys. We'll want
    to ensure that that is documented clearly.
    
    Change-Id: I14d441460116fda91fbd1d2097c5598b57155a6d

commit d0236047270924dec7a63863ff4c2af9cff1aa1a
Author: Ryan Brady <rbrady@redhat.com>
Date:   Wed Jan 8 09:06:32 2014 -0500

    Add optional cinder storage node to overcloud
    
    Mergeable block storage yaml template. Makefile updated to create a
    overcloud-with-block-storage template to deploy an additional machine
    as a block storage node.
    
    Change-Id: I37c06cde114592507a4583f7ec53ffac123d66e3

commit 9e75c7e46022db0b6d9370701883e63ae455b759
Merge: 7bd5d38 47cd2ae
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 14 18:06:50 2014 +0000

    Merge "Add undercloud-vm-ironic-source yaml file"

commit 7bd5d382e9eeacbdfe57e4df4596562626258bae
Merge: 9b39f37 787418f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 14 17:44:44 2014 +0000

    Merge "Add all and clean targets to makefile"

commit 9b39f379900cb09dbfcd3668352677a2b196a094
Merge: cf45003 5ea44eb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 14 17:44:40 2014 +0000

    Merge "Avoid echoing comment from makefile recipe"

commit 787418f73ee9721cc3e8b93e2f82be38be9d9588
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Jan 14 14:02:34 2014 +0000

    Add all and clean targets to makefile
    
    Just for convenience, particularly 'make clean'.
    
    Change-Id: Ic9964ace7fb4c675e84b3b9343fc8239abca44ac

commit 5ea44eb897a1f4da3d95a6ad9c3e875029caf82d
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Jan 14 10:51:41 2014 +0000

    Avoid echoing comment from makefile recipe
    
    We include a comment to explain why nova-compute-instance.yaml is
    included in the prerequisite list for overcloud.yaml, but this comment
    gets echoed by make before it executes the recipe using a shell.
    
      $> make overcloud.yaml
      # overcloud-source.yaml [..] won't work here because [..]
      # a prerequisite but don't want to pass it into merge.py
      python ./tripleo_heat_merge/merge.py overcloud-source.yaml [..]
      mv overcloud.yaml.tmp overcloud.yaml
    
    Instead, maintain a list of files included by overcloud.yaml in a
    variable and put a comment above that.
    
    Change-Id: I1af69fbb33e1833170f086aec9b54c5c4e57138f

commit cf45003e97d0007ea4e706bde7a62bdd014baf0d
Author: Roman Podoliaka <rpodolyaka@mirantis.com>
Date:   Mon Jan 13 14:45:15 2014 +0200

    Add a wait condition to undercloud stack
    
    Using of Heat wait conditions allows us to reliably reason when a
    stack creation is complete (as the completion handle is triggered
    when os-refresh-config completes).
    
    Change-Id: I89725143532177a0b4aea23c1c31bc7737da0896

commit 47cd2aeca9d999d3e903fc325851cda515e463ef
Author: Devananda van der Veen <devananda.vdv@gmail.com>
Date:   Fri Jan 10 23:31:44 2014 -0800

    Add undercloud-vm-ironic-source yaml file
    
    Copies the undercloud-vm-source yaml file and removes portions which
    were particular to nova-baremetal, replacing them and paving the way
    for further Ironic-specific changes.
    
    Change-Id: Ied49b0f8018291a0851cf2e10d83a174cb180479

commit 5b3593cc0d2b5b51cbfb03041cfb6c3bc05f4381
Merge: 31f519e ed3663b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 8 13:01:04 2014 +0000

    Merge "Add Ceilometer parameters for the overcloud"

commit 31f519ef88352fd4c439c56df87b36e73355778b
Author: Clint Byrum <clint@fewbar.com>
Date:   Sun Jan 5 12:07:53 2014 -0800

    Configure undercloud to use ext4 ephemeral FS
    
    Ext4 is significantly more efficient when being created, and we do not
    need to support older OS's or platforms that do not support ext4.
    
    This will be ineffective until the change to the nova element lands,
    but it is harmless to land this first. That change is referenced by this
    Gerrit change ID in tripleo-image-elements:
    
    Ic754f3b342b632a6919d4ad1b808627ec9fa4308
    
    Closes-Bug: #1266262
    Change-Id: Icca5fd94ca230141818ee9adb416f6f062869c6b

commit ed3663bb150d05e7a300336e5c07d18d3afb5ab8
Author: Tomas Sedovic <tsedovic@redhat.com>
Date:   Tue Dec 17 04:25:15 2013 -0500

    Add Ceilometer parameters for the overcloud
    
    Change-Id: I205bb2c0bb7c9b956fd3e0d6b266bdf5afb48864

commit c9ce27c981d74c18f844fa71339c0177c3f76b28
Author: marios <marios@redhat.com>
Date:   Fri Nov 29 15:12:33 2013 +0200

    Make merge.py installable as a package using pbr
    
    Now that merge.py is invokable from another script
    (Ia6b6416fe10358d23f2b120283eecaf4c1178cfd) and from comments at that
    review, it makes sense to offer a nicer way to consume the merge
    functionality.
    
    Once you git clone tripleo-heat-templates you can python setup.py
    install and get /usr/bin/tripleo_heat_merge as well as a
    tripleo_heat_merge package in python2.7/site-packages.
    
    Makefile edits required because we moved merge.py into the
    tripleo_heat_merge directory for the packaging.
    
    Change-Id: I587fa7a826f93f89e8e5c266af7f5765438fe738

commit f6289d012740c730ac1b9b0ea8a3842f8c72149e
Author: Robert Collins <rbtcollins@hp.com>
Date:   Tue Dec 17 15:26:32 2013 +1300

    Permit setting overcloud image update policies.
    
    This is the first step towards preserving state on stack updates when the image
    id has changed.
    
    I chose REPLACE as the default value because that is the current behaviour and
    we can override it from the command line.
    
    Change-Id: I64eab51892922ab51a89a9f389457fd1ed979fb2

commit 3697a4ef029c1f896afbdcf1039d1aeb3761c8b2
Author: marios <marios@redhat.com>
Date:   Fri Dec 13 14:20:49 2013 +0200

    Adds included-template-dir param for resolving template FileIncludes
    
    In I587fa7a826f93f89e8e5c266af7f5765438fe738 there is a problem with
    the overcloud.yaml Make target. Once the merge.py script is moved from
    where the templates are, FileInclude paths cannot be resolved relative
    to the script. The included-template-path defaults to './'
    
    Change-Id: I220c5e52d8062e98aa28a1c582e29c7e844bc9ae

commit 18c5998d293523ea16c38fb0c57e3b240463763c
Author: marios <marios@redhat.com>
Date:   Mon Nov 18 16:15:17 2013 +0200

    Make merge.py invokable from another script
    
    Until now this script has been used at the command line. Tuskar would like
    to consume the merge.py functionality to generate the overcloud heat stack
    template. A main() is thus added here as well as a few related nits like
    ensuring paths are absolute for included files. The actual merge
    functionality is split into its own method so it can be invoked more
    cleanly from calling scripts. The main method is then used at the command
    line as before
    
    For more info about how this will all be used by Tuskar see
    I578b4e9f238590ea245b827bc75d252568d194fe
    
    Change-Id: Ia6b6416fe10358d23f2b120283eecaf4c1178cfd

commit b1b60b258706137ce6c28d1bc03f5b19b044f289
Merge: dbda731 b9198ad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 27 18:00:15 2013 +0000

    Merge "Fix case of OpenStack in templates."

commit b9198ad03a824a12e6b5331f1995473257fb0665
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Nov 26 11:19:40 2013 -0500

    Fix case of OpenStack in templates.
    
    merge.py seems to look for OpenStack::ImageBuilder::Elements
    
    But we use Openstack::ImageBuilder::Elements in our templates.
    
    Change-Id: I94ee367cf77c3f2929ee23d2dcdd28622849c89e

commit dbda731e48f6bb29cd40cfa774a751c2566b6297
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Nov 25 21:21:05 2013 -0500

    Name the undercloud resources with 'undercloud'.
    
    Using notcompute for the undercloud resources is a bit confusing
    so lets rename them accordingly. This change shouldn't effect
    the devtest scripts or toci because we don't pass a parameter
    in for the undercloud.
    
    Change-Id: I33c28a3554fe117c5a0a6e641ea277f7a95f2b35

commit 38fcc17219bc2457be42e323295784fd0e04747c
Author: Clint Byrum <clint@fewbar.com>
Date:   Mon Nov 25 13:31:02 2013 -0800

    Wait for o-r-c on nova compute as well.
    
    We have seen situations where nova-compute is not ready when notcompute
    has run its waitcondition. That leads to  errors while we fail to boot
    instances until there is at least one nova compute available.
    
    We also update nova-compute-instance.yaml so that it continues to work
    stand-alone.
    
    Change-Id: Iadea7a34e2cd4576cc78659b99c12e1041af5b45

commit e6afddb3ca4f100ad29fc7a9c30f43e6e5abdc22
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Nov 22 12:49:42 2013 -0500

    Use merge.py for the undercloud templates.
    
    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

commit 5e23ab27f0d2530aa2fde0ece84c5eb4ec81b11c
Author: Chris Krelle <nobodycam@gmail.com>
Date:   Wed Nov 20 15:33:52 2013 -0800

    enable Ironic password for keystone auth
    
    The current version of the ironic-source.yaml uses AdminPassword, it
    should use the ironic users password and not the admin user password.
    The patch corrects an authentication error by adding IronicPassword
    to ironic-source.yaml file.
    
    Change-Id: Idbe4950bb3026e2201ddfddc4b58c2bf98972be9

commit 378783f876e10b88becdcd1eb0d0d24fd45e7a80
Author: Derek Higgins <derekh@redhat.com>
Date:   Mon Nov 11 20:42:46 2013 +0000

    Add metadata to configure swift
    
    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

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