aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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-11Merge "Enable Neutron DVR support in TripleO installation"Jenkins4-1/+80
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
2014-10-07Merge "Add SwiftMinPartHours parameter"Jenkins3-0/+7
2014-10-07Secure the MySQL bind-address on the undercloudTherese McHale1-0/+1
The MySQL bind-address on the undercloud should be set to localhost for security. Change-Id: I0ea485fa6673c06087f5c5baedf591fba54288a4
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-30Merge "Remove unnecessary completion signal"Jenkins1-1/+0
2014-09-29Add SwiftMinPartHours parameterLorcan3-0/+7
This parameter adds the facility for an operator to set the length of time in hours that a partition in a swift ring can be altered following a rebalance of that ring. The default value is set to one. The corresponding element change is here: Ie6438386a54794e1ae2f31ad925db01c2c10ed6d Change-Id: Icc5e431a7e2884b3ca3a255b6fd901619bc98460
2014-09-26Merge "undercloud: use Nova compute Ironic driver"Jenkins1-2/+2
2014-09-19undercloud: use Nova compute Ironic driverDan Prince1-2/+2
Updates the NovaComputeDriver and NovaSchedulerHostManager defaults so that we use the Nova in-tree versions of the Ironic compute and scheduler host managers. The old Ironic in-tree drivers are now deprecated. Change-Id: I91667a3e7861591285c931006c448cc304649349
2014-09-19Drop CinderLVMLoopDeviceSize from the undercloudDan Prince1-4/+0
This parameter is unused so lets drop it. Change-Id: Ie0bec06b14b6b284716604281d29fea065c2a03b
2014-09-18Remove unnecessary completion signalTom Cammann1-1/+0
There is a spurious completion signal in nova compute config which is confusing and unnecessary. Change-Id: I302470933c80443a1069faa03cc924f14ba71ca3 Co-Author: Nicholas Randon
2014-09-18Merge "Deprecate Role and ImageBuilder metadata handling"Jenkins1-0/+7
2014-09-16Merge "Parametrize Swift partition power"Jenkins3-1/+7
2014-09-15Merge "Parameterize network type and tunnel types"Jenkins3-3/+31
2014-09-15Parameterize network type and tunnel typesJames Slagle3-3/+31
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 Baker2-21/+16
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-12Merge "Fix spelling of controller0_VLANPort"Jenkins1-1/+1
2014-09-10Merge "Add specific pass-through config for each role"Jenkins3-3/+56
2014-09-10Deprecate Role and ImageBuilder metadata handlingTomas Sedovic1-0/+7
Our templates and elements no longer depend on `OpenStack::Role` or `OpenStack::ImageBuilder::Elements` metadata. Using either now prints out a deprecation warning. Change-Id: I91e79b00bacca8caf13d4b6fa83d90e9c20b241c
2014-09-08Merge "Update overcloud examples for ExtraConfig"Jenkins2-4/+4
2014-09-05Update overcloud examples for ExtraConfigDan Prince2-4/+4
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-05Undercloud params for compute driver and managerDan Prince6-4/+45
Add undercloud template parameters for NovaComputeDriver, NovaComputeManager, and NovaSchedulerHostManager. The motivation here is to be able to test configure Nova to use the new (in-tree) Ironic compute driver (which used to live in Ironic). NOTE: The initial Nova in-tree Ironic driver won't have its own ClusteredComputeManager (compute_manager). Even so I've gone ahead and added a parameter for NovaComputeManager so we can modify this accordingly in the future without making hard coded template changes. Change-Id: Ib48a6b6d8a6cff157bdf3948bd0330e9b29dd46a
2014-09-05Parametrize Swift partition powerEamonn O'Toole3-1/+7
The Swift partition power is currently hard-coded to 10. While this is fine for small Swift clusters there are some users who will want to configure rings with higher partition powers. We have parametrized the value of the partition power, and the default is set to 10. Change-Id: If115cf5cf2f4c2ff7d28b0f5ae3d2ca3f4b4be5a
2014-09-04Fix spelling of controller0_VLANPortJames Polley1-1/+1
Prior to this change, using these templates fails as controller0_VLANPort is defined, but we attempt to use controller0VLANPort instead. Change-Id: Ieb2eece4e7d48177acae0bef916192d8e6a4a4a3
2014-09-02Merge "Make turning debug on globally easy."Jenkins4-0/+25
2014-09-02Merge "Change | to > in templates."Jenkins2-8/+8
2014-09-01Merge "Remove unused Neutron values"Jenkins2-14/+0
2014-09-01Add specific pass-through config for each roleNicholas Randon3-3/+56
Supplement ExtraConfig with specific versions - ControllerExtraConfig and NovaComputeExtraConfig. This allows the user to specify different configurations for each role. Change-Id: Ieaee80e414130504a5e40e878a5a4ca1c196ca2b