aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-12-19Merge "Set default network interfaces to nic1"Jenkins7-9/+9
2014-12-17Set more aggressive keepalive timingsGiulio Fidente2-0/+8
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"Jenkins11-15/+18
2014-12-09Merge "bump up the number of sesson limit for rabbitmq"Jenkins2-0/+2
2014-12-05Remove missing cinder-storage Neutron* parametersDan Prince1-4/+0
In I00af10e07feed6c9c97ee6cad545dbff88cd6afc we removed the Neutron* parameters from cinder-storage.yaml but we forgot to also remove them from overcloud-without-mergepy.yaml. Change-Id: I09f2eb278fa0eba1dff80884f12b6f682c7b0484
2014-12-05Add missing novncproxy settings to controllerDan Prince1-0/+3
This patch adds the missing HAProxy novncproxy parameters to controller.yaml These parameters were adding to overcloud-source.yaml in I0c6a3d6a8fd10da71abbf568633b28bdb5e56aa2. Change-Id: Icff2f17a301e5e95fa43549ec1566c0c0d5b5353
2014-12-05Add missing HAProxy settings to controllerDan Prince1-0/+6
This patch adds the missing parameters to controller.yaml These parameters were adding to overcloud-source.yaml in I1581c091b996422fb1374ea4c024d0a88453e10b. Change-Id: I3e4e0e1feb521dded2679fed508fa97e8dd27661
2014-12-05Add missing Neutron DVR params to without-mergepyDan Prince4-1/+100
This patch adds the missing parameters to overcloud-without-mergepy.yaml. These parameters were adding to overcloud-source.yaml in I422c65e7d941593083d52ad7fdf0dfd1d2fb3155. Due to the concurrent review window they never made it into the new overcloud-without-mergepy.yaml implementation. Change-Id: If54dc111aec852f906c9e7ac1bf56f9dcaf678ea
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-05Add missing Keystone params to without-mergepyDan Prince2-0/+23
This patch adds the missing KeystoneSSLCertificate and KeystoneSSLCertificateKey to overcloud-without-mergepy.yaml. These parameters were adding to overcloud-source.yaml in Icf46132230512a31b6dec3c07164c95b13dd8f73. Due to the concurrent review window they never made it into the new overcloud-without-mergepy.yaml implementation. Change-Id: I8b1155ca0a28392e5d5ade57d53bf810d8b5f053
2014-12-05Add missing Rabbit params to without-mergepyDan Prince2-0/+24
This patch adds the missing RabbitClientUseSSL and RabbitClientPort to overcloud-without-mergepy.yaml. These parameters were adding to overcloud-source.yaml in I7b7613cb60b9095ba5665c335c496fea4514391a. Due to the concurrent review window they never made it into the new overcloud-without-mergepy.yaml implementation. Change-Id: I182671b84d0a21d7018eb136003968f101384716
2014-12-05Set default network interfaces to nic1Dan Prince7-9/+9
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-05Merge "Remove LiveUpdate params"Jenkins6-115/+0
2014-12-05Align the cinder-storage.yaml template with block-storage.yamlGiulio Fidente2-55/+7
Change-Id: I00af10e07feed6c9c97ee6cad545dbff88cd6afc
2014-12-01Remove LiveUpdate paramsDan Prince6-115/+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 Zhao2-0/+2
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 Kowalik11-15/+18
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-26Merge "Don't replace OS::Neutron::Port on update of undercloud"Jenkins1-0/+1
2014-11-25Fix empty local_ip in ml2_conf.ini on undercloudJerry Zhao1-0/+2
empty local_ip in ml2_conf.ini would make neutron-openvswitch-agent fail to start, then fail to bridge dhcp to br-ctlplane and pxe boot an overcloud, so provide the value in undercloud-source.yaml. Related-Bug: #1394956 Change-Id: If3a94b9c2b971ceb7601f91a2db64989960fb5d3
2014-11-19Merge "Split out Nova software config"Jenkins3-62/+79
2014-11-18Merge "Add swift.mount-check metadata"Jenkins4-0/+12
2014-11-14Split out Nova software configDan Prince3-62/+79
This is a step towards supporting pluggable software configurations in the heat templates. By moving compute-config out of compute.yaml we make it possible to define alternate implementations by changing the OS::TripleO::Compute::SoftwareConfig value in the overcloud-resource-registry.yaml heat environment file. Co-Authored-By: Steve Hardy <shardy@redhat.com> Change-Id: I250dc1a8c02626cf7d1a5d2ce92706504ec0c7de
2014-11-14Merge "Use HAProxy httpchk for openstack services"Jenkins1-0/+6
2014-11-13Provide a single stunnel connect_hostNicholas Randon1-24/+5
At present connect_host is specified by each port, individually, as the same value. Move connect_host to be a direct child of the stunnel element so it is only specified once. Although previously we could theoretically specify a different connect_host for each service, in practice they were the same and that never would have worked. This change means Mustache like {{#stunnel.connect_host}} will work. Change-Id: I25c4bb09cf28a3728e959d4dd583af26a602ad90 Partial-Bug: #1391926
2014-11-12Add swift.mount-check metadataEamonn O'Toole4-0/+12
We've submitted a patch (https://review.openstack.org/#/c/130172/) to set the value of mount_check to swift.mount-check if it exists, and otherwise to set mount_check to false. By default TripleO deployments set mount_check to false since they do not use mounted disks to store data. However we (HP) and others are now using TripleO to deploy Swift servers with mounted drives for data, in which case mount_check should be set to True. This change adds swift.mount-check data and sets it to the value of the SwiftMountCheck parameter, which has a default value of False. Change-Id: I36fece56bafa9fe9c4883b572687b3fc819eeae1
2014-11-11Merge "Enable Neutron DVR support in TripleO installation"Jenkins4-1/+80
2014-11-10Don't replace OS::Neutron::Port on update of undercloudJames Polley1-0/+1
This change is congruent with I6dd02ae17407f8f4c81ae418e5027f4f38ae4e9b but applies to undercloud configs rather than overcloud configs. I've listed this as closing 138709 even though that bug didn't talk about the undercloud as this seems like it's another instance of the same issue seen there. Change-Id: I3ee80043bb455460991e78525fa4310934df4697 Closes-Bug: #1383709
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"Jenkins4-0/+32
2014-10-31Merge "Add converted version of block and object storage"Jenkins6-18/+492
2014-10-30Merge "Don't replace OS::Neutron::Port on update"Jenkins3-0/+5
2014-10-30Merge "Add SSL PKI properties for keystone"Jenkins2-0/+24
2014-10-28Don't replace OS::Neutron::Port on updateSteve Hardy3-0/+5
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-27Merge "Simplify the layout of haproxy net binds config"Jenkins1-18/+6
2014-10-24Merge "Add block completion signal"Jenkins1-0/+1
2014-10-23Use parameter constraints for image, key and flavorSteven Hardy4-0/+32
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 Colnick4-1/+80
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 Haynes2-0/+24
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-21Add converted version of block and object storagePeter Belanyi6-18/+492
This patch extends the previous 'Don't use merge.py for overcloud' commit with the cinder-storage.yaml and swift-storage.yaml templates. Requirements for this to deploy: 1. Block and object storage images have to be built (overcloud-cinder-volume and overcloud-swift-storage) 2. The images have to be loaded by devtest_overcloud.sh OVERCLOUD_CINDER_ID=$(load-image -d $TRIPLEO_ROOT/overcloud-cinder-volume.qcow2) OVERCLOUD_SWIFT_ID=$(load-image -d $TRIPLEO_ROOT/overcloud-swift-storage.qcow2) Change-Id: I45f9d9f051970a83e26c0fd924d7c98276958113
2014-10-21Add block completion signalAlexis Lee1-0/+1
In I973d197245ed32612bde9209479e6ae3a443fc69, the signal_transport was set to NO_SIGNAL to prevent the resource staying CREATE_IN_PROGRESS forever. This means that Heat reports the stack is configured before it actually is. The correct fix was to add completion-signal to BlockStorageConfig. However now there's a BlockStorage0AllNodesDeployment, we simply have to receive the signal from allNodesConfig by setting the deployment signal-transport. Change-Id: I1f6408ca39fddd146e7aae140f61d265bbf563ec
2014-10-20Compute and controller templates without merge.pyTomas Sedovic4-158/+1738
This provides three templates: overcloud-without-mergepy.yaml, compute.yaml and controller.yaml. These can be used in combination with overcloud-resource-registry.yaml to deploy the overcloud on their own -- without having to do any pre-processing (via merge.py). To test these you have to add the resource registry environment (in addition to the existing `-e` option) and use the new overcloud template in the Heat call in devtest_overcloud.sh (line 374): heat $HEAT_OP -e $TRIPLEO_ROOT/overcloud-env.json \ -e "$TRIPLEO_ROOT/tripleo-heat-templates/overcloud-resource-registry.yaml" \ -t 360 \ -f $TRIPLEO_ROOT/tripleo-heat-templates/overcloud-without-mergepy.yaml \ -P "ExtraConfig=${OVERCLOUD_EXTRA_CONFIG}" \ $STACKNAME The existing overcloud Heat environment ($TRIPLE_ROOT/overcloud-env.json) should keep on working. Scaling is now being controlled by the `ControllerCount` and `ComputeCount` template parameters, though. NOTE: the changes here depend on a fairly recent Heat build (commit e5f285f6cb from ~7th September, 2014). In other words, this requires Juno Heat. Also, passing more than one environment file to Heat requires python-heatclient version 0.2.11. Change-Id: I687a00c7dc164ba044f9f2dfca96a02401427855
2014-10-20Merge "Passthrough{Specific} and allNodesConfig for BlockStorage nodes"Jenkins1-1/+39
2014-10-17Passthrough{Specific} and allNodesConfig for BlockStorage nodesGiulio Fidente1-1/+39
Purpose of this change is to allow passthrough of *specific values* for *same key* in particular to BlockStorage nodes. Same behaviour is already implemented for controllers and computes. Change-Id: I7074a8f7d406adaa56e55013b10bd520fcacfcf6
2014-10-16Merge "Refactor Heat dependencies for nova compute"Jenkins1-3/+4
2014-10-15Merge "Configures haproxy to serve novnc_proxy"Jenkins1-0/+3
2014-10-15Merge "Secure the MySQL bind-address on the undercloud"Jenkins1-0/+1
2014-10-14Refactor Heat dependencies for nova computeTom Cammann1-3/+4
Allows heat to have more control of the parallelism of the deploy and allow easy integration of the new heat dependencies required for nova compute integration. At present is difficult understand and has unnecessary complex dependencies. Change-Id: Ie566b8b14cbd98fe29cc2368a96d45cc74ca4715 Co-Authored-By: Nicholas Randon <nicholas.randon@hp.com>
2014-10-08Sort inputs and parametersAlexis Lee11-389/+387
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