summaryrefslogtreecommitdiffstats
path: root/overcloud-source.yaml
AgeCommit message (Collapse)AuthorFilesLines
2015-02-23Deprecate the old mergepy overcloud templatesDan Prince1-966/+0
This patch moves all the related mergepy templates for the overcloud into a deprecated directory. The Makefile has been updated so that overcloud.yaml is still generated at the top level so this shouldn't break end users. This is to reduce confusion for new users who are learning the TripleO heat templates and find the fact that we have two full implementations very confusing. Change-Id: I0848aca4dee3e37cb4c6089c5f655ad22ac6c5fd
2015-01-27Merge "Add parameter to manage usage of Neutron l3_ha option"Jenkins1-0/+7
2015-01-09Add parameter to manage usage of Neutron l3_ha optionGiulio Fidente1-0/+7
This change will allow for the enablement of Neutron routers HA via the new NeutronL3HA parameter. Change-Id: Ia5f7c0b4e89159456482e840c50d166ec5f25d4c Implements: blueprint tripleo-icehouse-ha-production-configuration
2015-01-08Remove invalid NTP configuration in templatesNicholas Randon1-1/+1
Currently the all templates have an invalid setting for NTP setup for the fudge setting. This should be removed from the templates which will remove the warning seen in syslog. ntpd[...]: inappropriate address xxx.xxx.xxx.xxx for the fudge command, line ignored Partial-Bug: 1408379 Relates-To: Ib9931b84925d9ceb32f18e9adc5be64402fbf61e Change-Id: I56a03dc0a899a8c515f2a05d678d7e80e9b7b93c
2015-01-08Merge "Don't store Ceilo DB credentials on compute node"Jenkins1-6/+0
2015-01-07Merge "Pass Horizon port through to controller nodes"Jenkins1-0/+5
2014-12-23Pass Horizon port through to controller nodesJonathan Brownell1-0/+5
The Horizon port may vary based on SSL enablement, and needs to be known by the nodes for the purpose of iptables rules, etc. Change-Id: Iec475a6c245a5bfe8b1d63ff72b6d0299861615c
2014-12-23Merge "Don't store Neutron DB credentials on compute node"Jenkins1-6/+0
2014-12-23Merge "Don't store Nova DB credentials on compute nodes"Jenkins1-7/+1
2014-12-19Merge "Set default network interfaces to nic1"Jenkins1-2/+2
2014-12-17Set more aggressive keepalive timingsGiulio Fidente1-0/+4
We want to customize the default kernel keepalive timings and make them more aggressive to workaround lack of hearbeat support in the Oslo RabbitMQ client, see: https://bugs.launchpad.net/oslo.messaging/+bug/856764/comments/19 and https://bugs.launchpad.net/oslo.messaging/+bug/856764/comments/70 Change-Id: Ieac08f595086acb8dd336e33efc705ee0b8a3a87 Closes-Bug: 1301431 Closes-Bug: 1385240 Closes-Bug: 1385234
2014-12-09Merge "Remove default flavor from every template"Jenkins1-2/+0
2014-12-09Merge "bump up the number of sesson limit for rabbitmq"Jenkins1-0/+1
2014-12-08Don't store Ceilo DB credentials on compute nodeDan Prince1-6/+0
This patch removes all references to the Ceilometer DSN parameter in the overcloud compute templates. These credentials are not required in order to run the required Ceilometer service/agents. Change-Id: I421ce4fca87ac87dd65ab8bbb20e7ea9be8d9c5d
2014-12-08Don't store Neutron DB credentials on compute nodeDan Prince1-6/+0
This patch removes all references to the Neutron DSN parameter in the overcloud compute templates. These credentials are not required in order to run the required Neutron services. Change-Id: I0691f43bd2ce85bec0d68ab979136414f0610c61
2014-12-08Don't store Nova DB credentials on compute nodesDan Prince1-7/+1
Remove NovaDSN from overcloud compute. When using the Conductor the Nova compute service does not need access to the database. This patch removes all references to the Nova DSN in the overcloud compute templates. Change-Id: If75f480489b84002dd061c183dbee3572a8b63f1
2014-12-05Remove duplicate Neutron params in overcloudDan Prince1-8/+0
In I422c65e7d941593083d52ad7fdf0dfd1d2fb3155 (Enable Neutron DVR support in TripleO installation) we added duplicate parameters for NeutronPublicInterfaceRawDevice and NeutronNetworkType. In preparation for syncing with overcloud-without-mergepy.yaml lets remove these dups. Change-Id: Ib4888bc91f30aeb3aba590b69e4919a93f577143
2014-12-05Set default network interfaces to nic1Dan Prince1-2/+2
Now that we are using os-net-config we can make use of the nic naming abstraction layer where the actual physical nic name is mapped automatically. This change removes all the eth0 references and replaces them with nic1 which should make it more likely that these default values would actually work on some distributions. It also removes the single instance of eth2 in the undercloud-bm-nova-deploy.yaml template and replaces it with nic1 as well. Underclouds aren't a special case in this regard (I run my bare metal undercloud on em1) so there is no good reason to default to the second nic. Change-Id: I3ea92a502bc4b8789f74913f232ac8bc6b843008
2014-12-01Remove LiveUpdate paramsDan Prince1-21/+0
The params were added in I2997d23c584055c40034827e9beb58e6542ea11c as a means to pass undercloud image data to overcloud instances so they could perform an update via takeovernode). We've never actually made use of them via takeovernode... furthermore these params are a bit stale in that they haven't been applied to other instance types (storage, etc.). I propose we remove them entirely and start with a fresh plan for how these would get used (perhaps a blueprint). As is these don't appear to have ever been fully wired up to do anything removing them should have no effect on end users. Change-Id: I96f91fb0d67e7fe203d3767c8ab89ce82adbe331
2014-11-28bump up the number of sesson limit for rabbitmqJerry Zhao1-0/+1
the default maxconn is only 150, which maybe good for api services but not enough for the rabbitmq session in a cluster as small as 15 nodes. so bump up the number to 1500 for rabbitmq to allow for 100 nodes. this number should be calculated based on the scale numbers in the long run. Closes-bug: #1386406 Change-Id: Ieb707b31022a6fc9ade32ed2a332b67bf4dc0311
2014-11-27Remove default flavor from every templateSteve Kowalik1-2/+0
With the push to using the new setup-flavors provided by os-cloud-config, the default flavor will no longer be called 'baremetal', and Heat will always validate the default even if it is overridden. To that end, remove the default flavor from every flavor definition. Just to be certain, also add a custom_constraint to every flavor definition that was missing it. Change-Id: I24251e73be4e86738857f73b89499f592c4908de
2014-11-14Merge "Use HAProxy httpchk for openstack services"Jenkins1-0/+6
2014-11-11Merge "Enable Neutron DVR support in TripleO installation"Jenkins1-1/+49
2014-11-07Use HAProxy httpchk for openstack servicesTom Cammann1-0/+6
Instead of the default TCP connection check use the HTTP check. This provides a more reliable way to tell if the service is up or not, only 2xx and 3xx response codes will signal a healthy service. This check can also be used in conjunction with check-ssl to enable checks for services running SSL/TLS in overcloud. Change-Id: I1581c091b996422fb1374ea4c024d0a88453e10b
2014-10-31Merge "Use parameter constraints for image, key and flavor"Jenkins1-0/+10
2014-10-30Merge "Don't replace OS::Neutron::Port on update"Jenkins1-0/+2
2014-10-30Merge "Add SSL PKI properties for keystone"Jenkins1-0/+12
2014-10-28Don't replace OS::Neutron::Port on updateSteve Hardy1-0/+2
Due to an ununsual interface to OS::Neutron::Port resources, it's necessary to specify replacement_policy: AUTO, or the resource is unconditionally replaced on every stack update. I've started discussion re possibly changing the default in Heat, but right now, we need this or we have the bad outcome of replacing all (!) compute and controller nodes on every stack-update, even if the templates are unmodified. Passing the AUTO value should be safe regardless of any potential change of default value in Heat. Change-Id: I6dd02ae17407f8f4c81ae418e5027f4f38ae4e9b Closes-Bug: #1383709
2014-10-27Add overcloud options for SSL RabbitMQ connectionsPhil Neal1-0/+12
Adds configuration options for Rabbit port and use_ssl settings using a shared RabbitMQ parameter. Change-Id: I7b7613cb60b9095ba5665c335c496fea4514391a
2014-10-23Use parameter constraints for image, key and flavorSteven Hardy1-0/+10
If you don't have (or provide) the wrong image, KeyName, or flavor, we fail at some later point (not always early, depending on what's wrong). Since Icehouse, Heat has had a "custom constraints" method of dynamically validating parameter values, by comparing the value provided with a list from the underlying service. Despite the name, there's nothing "custom" about the constraints, these ones are included in Heat by default (though they are pluggable, which is where the name comes from..) See the docs for more info: http://docs.openstack.org/developer/heat/template_guide/hot_spec.html#custom-constraint Note, I've not considered network validation here, this could possibly be added in a subsequent patch. These constraints are evaluated via any of the following: - heat template-validate -f <template> - heat stack-preview <arguments given to create> - heat stack-create <arguments, fails fast before creating anything> - heat stack-update <arguments, fails fast before updating anything> Change-Id: I3a6374ce5421575cdde893c62aa97c750a07acd8
2014-10-23Enable Neutron DVR support in TripleO installationErik Colnick1-1/+49
This change adds the necessary elements to the overcloud-source.yaml, nova-compute-config.yaml and nova-compute-instance.yaml to allow Neutron Distributed Virtual Routers (DVR) to be enabled. The added elements are set to default to values such that DVR is not enabled in keeping with backwards compatibility. Change-Id: I422c65e7d941593083d52ad7fdf0dfd1d2fb3155 blueprint: support-neutron-dvr
2014-10-22Add SSL PKI properties for keystoneGregory Haynes1-0/+12
To implement the SSL PKI spec we need to change the keystone ssl cert and cert key properties to be more generalizable. We also need to support the old properties for backwards compatibility. Change-Id: Icf46132230512a31b6dec3c07164c95b13dd8f73
2014-10-22Simplify the layout of haproxy net binds configNicholas Randon1-18/+6
Make the net binds simpler to maintain. Change-Id: I7c7f2cde38a88976afe33097cdfe4a93d62a6417
2014-10-15Merge "Configures haproxy to serve novnc_proxy"Jenkins1-0/+3
2014-10-08Sort inputs and parametersAlexis Lee1-166/+166
They're mostly rather higgledy-piggledy at the moment which makes it quite difficult to compare against files where these are sorted. EG compute.yaml from I687a00c7dc164ba044f9f2dfca96a02401427855. Change-Id: I508a3d0f6a79810d2100fdd1ad143bcd37bf8c00
2014-10-01Configures haproxy to serve novnc_proxyLoganathan Parthipan1-0/+3
This patch configures haproxy to serve novnc_proxy which currently listens on 0.0.0.0. So before this patch goes in novnc needs to be listening on local-ipv4 like the rest of the services. The following patch does that in image-elements. https://review.openstack.org/#/c/125326/ Change-Id: I0c6a3d6a8fd10da71abbf568633b28bdb5e56aa2
2014-09-15Merge "Parameterize network type and tunnel types"Jenkins1-3/+19
2014-09-15Parameterize network type and tunnel typesJames Slagle1-3/+19
Remove the hardcoding of gre as the Neutron tenant network type for the Overcloud. This will enable the ability to deploy an Overcloud that uses vxlan instead of gre tunnels. A new parameter, NeutronTunnelTypes, is added to allow configuring the tunnel_types parameter in the Neutron ML2 configuration. This change is required by https://review.openstack.org/#/c/92913 Change-Id: I2c2e2153a61349e58ada28c87aa2338c9f00e7bd
2014-09-14Use the server name attributeSteve Baker1-16/+14
The 'show' attribute results in a nova API call, which has performance overhead even with attribute memoization. The name attribute was added to expose the name without needing an API call, since the resource already knows the name. This change switches from using 'show' to 'name' throughout. Change-Id: I1e83dd008cd02e5cec97868db0d5a695f07b7199
2014-09-10Merge "Add specific pass-through config for each role"Jenkins1-3/+35
2014-09-05Update overcloud examples for ExtraConfigDan Prince1-2/+2
The existing examples for the overcloud ExtraConfig options use an ironic setting that would likely never apply (Ironic isn't for the overcloud). This patch modifies the default section setting to use the Nova force_config_drive option instead as a config example. Change-Id: Ieb893552fe9466b90b9d9a831a676d114efb6db1
2014-09-02Merge "Make turning debug on globally easy."Jenkins1-0/+10
2014-09-01Add specific pass-through config for each roleNicholas Randon1-3/+35
Supplement ExtraConfig with specific versions - ControllerExtraConfig and NovaComputeExtraConfig. This allows the user to specify different configurations for each role. Change-Id: Ieaee80e414130504a5e40e878a5a4ca1c196ca2b
2014-08-30Change | to > in templates.Robert Collins1-6/+6
Clint pointed out that | prevents things rendering properly on arbitrarily wide screens. For most things that makes sense but it doesn't for the JSON examples IMO so I didn't alter those. Change-Id: Ifb7dcc265c225b000bd5d26500212d41ea0233c8
2014-08-29Merge "Expose public_interface_tag support."Jenkins1-0/+12
2014-08-28Expose public_interface_tag support.Robert Collins1-0/+12
Proper VLAN support requires adding the IP address to a new device, rather than br-ex/br-ctlplane. This is added in the tripleo-image-elements change https://review.openstack.org/103449 (I3f77f72ac623792e844dbb4d501b6ab269141f8e) and here we just expose it with appropriate glue to get the IP address from Neutron. With this we can now describe a VLAN public interface scenario to the undercloud and overcloud control planes. Change-Id: I4d2194fc813aebb0708d6fddf4f05bae5f091fd8
2014-08-28Make turning debug on globally easy.Robert Collins1-0/+10
We can obviously use passthrough for this, but I rather suspect that OMFG something is broken get me debug will be a common phrase. Change-Id: I62539630a4737bbbe6883ed71929f38c819ceed4
2014-08-26Merge "Permit specifying VLAN mappings to overclouds."Jenkins1-1/+10
2014-08-25Merge "Fixup network configuration for ext-net"Jenkins1-8/+19
2014-08-25MySQL connections via HAProxy should not timeoutKiall Mac Innes1-0/+3
With the default 60 second timeout, many services will periodically log "MySQL has gone away" as HAProxy has closed the connection. Change-Id: Ied67344fbabcd77def4483be37a4706190ab28a0