summaryrefslogtreecommitdiffstats
path: root/overcloud-source.yaml
AgeCommit message (Collapse)AuthorFilesLines
2014-10-30Merge "Add SSL PKI properties for keystone"Jenkins1-0/+12
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-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
2014-08-25Merge "Set vnc to use controller virtual_ip"Jenkins1-0/+1
2014-08-25Merge "Make signal_transport a parameter"Jenkins1-0/+9
2014-08-22Set vnc to use controller virtual_ipRyan Moore1-0/+1
The address for the vnc proxy is incorrectly configured in the nova configuration file. The correct IP address is the Public Virtual IP address of the controller node as created by: I9649ee74ebaf62b6b929b28243a07c789a08867c The nova image_element nova.conf already has: novncproxy_base_url=http://{{nova.public_ip}}:6080/vnc_auto.html but nothing was setting nova.public_ip - until now Closes-Bug: #1332554 Change-Id: I41214834511680170393dd4325b510f549373141
2014-08-19Merge "Set the MySQL root password"Jenkins1-0/+5
2014-08-18Make signal_transport a parameterClint Byrum1-0/+9
There may be times where an update needs to change this without changing the template, such as when updates will be done by something other than Heat (i.e. Ansible). Change-Id: I89d1153acab697b64468f841b3f2d17c169da649
2014-08-18Merge "Rename NovaCompute resources suffix to be consistent with controller"Jenkins1-5/+5
2014-08-14Replace occurrences of list_join with Fn::JoinGiulio Fidente1-6/+6
When change I6730ffe1e27d952d563c16a9480298fbef9f61fe got merged we introduced some occurrences of list_join which should have been migrated to Fn::Join (change I039f57ab39c1fcfc319a7a34265ba4fabf4ccd08) This caused overcloud CI jobs to fail with: Property error : allNodesConfig: config Items to join must be strings This change fixes this by replacing newly introduced occurrences of list_join with Fn::Join Change-Id: Ibac193781d31d6f81e955e7b9381e13cfdd0ab1d
2014-08-14Merge "Add BlockStorage and SwiftStorage nodes into hosts"Jenkins1-0/+24
2014-08-14Set the MySQL root passwordTherese McHale1-0/+5
Set the MySQL root password to a random string for the undercloud and overcloud Change-Id: I6d38ca82c77a4aa8f58089c50aa5bf320ec0ecc6
2014-08-14Permit specifying VLAN mappings to overclouds.Robert Collins1-1/+10
To use a VLAN based public network we need the ext-net network to be a VLAN with a segmentation id - but we can't do this unless we also have the datacentre physical network marked as allowing vlans. We could make this strictly opt-in, but as this doesn't affect the switch configuration (and thus actual machine capabilities) having it on by default seems reasonable. OTOH we can't force it on, because high security environments may well want a defense in depth setup where neutron admins cannot configure VLANs that they are not meant to have access too (consider that the cloud machine admins may be separate to the folk running the services on top of them...) Change-Id: I9687751753f810896c6d065750910da40132c9fa
2014-08-14Fixup network configuration for ext-netRobert Collins1-8/+19
We currently make the external network a single-node gre network but this is not at all correct for HA environments - we need a provider network, which means having a bridge mapping, a flat network specified, and then because we run the same ovs config everywhere we need br-ex on the hypervisors too. This is entirely reasonable since DVR will require this as well (and solve lots of scaling issues...). Change-Id: I8b63ab51e7e20b235430fad8d786d8da005d84a1
2014-08-13Switch to heat_template_version: 2013-05-23Steve Baker1-24/+24
To support underclouds and seeds running older than the very latest heat. 2013-05-23 lacks function list_join, so this change reverts to using the equivalent function Fn::Join. Change-Id: I039f57ab39c1fcfc319a7a34265ba4fabf4ccd08 Closes-Bug: #1354305
2014-08-13Change overcloud to use VIP for MySQLJulia Kreger1-10/+68
This change sets applications to utilize the VIP address for database connectivity and sets HAProxy in between the applications and MySQL. Depends upon tripleo-image-elements changes: Ia6f26305f8e744e4ff938dff85de1193183ecd8f Iac1274cc52014f25887d696261b32146afc926dd I5af70abb96021146c098f788db349808d806a348 Related to blueprint tripleo-icehouse-ha-production-configuration Change-Id: Ia9d6ed2771f756d2a97ae5df7ed737a062a59cf2
2014-08-12Merge "Restore rabbit.host and add an haproxy rabbit listener"Jenkins1-0/+7
2014-08-08Restore rabbit.host and add an haproxy rabbit listenerGiulio Fidente1-0/+7
To balance load over the rabbit cluster we want to route access to it via haproxy. This also helps workaround bug #856764 as an additional benefit. This change sets rabbit.host to the ControlVirtualIP (to be used by the elements) and adds an haproxy listener for the rabbit nodes. Related to blueprint tripleo-icehouse-ha-production-configuration Depends on I3ff37ec18b9191ca8e861519bed142cbdbd5faa2 Change-Id: I49b622a604542f456bd9a37da8dae3353218e640 Related-Bug: 856764
2014-08-07Fix overcloud controller scalingTomas Sedovic1-5/+12
Controller scaling was broken by the commit 02772ba2877b9f6d427c6fd760bf19d6334c68a8. Merge.py raises an exception when it tries to scale the default value "controller0" of the `BootstrapNodeResource` parameter. This reverts back to using Fn::Select for specifying the bootstrap host, the rest of the Fn::Select -> get_attr changes are kept. Change-Id: I0cdebf75d4752a35f547d4fbb81545ece3172405
2014-08-06Rename NovaCompute resources suffix to be consistent with controllerGiulio Fidente1-5/+5
This change renames a few NovaCompute resources so that the naming is consistent with the controller resources naming choice. Change-Id: I8c22867b208c5e16fd52bb3157f838f762b71470
2014-08-05Add BlockStorage and SwiftStorage nodes into hostsGiulio Fidente1-0/+24
With this we populate the hosts key (needed for /etc/hosts editing) with the BlockStorage and SwiftStorage nodes too. Change-Id: I6730ffe1e27d952d563c16a9480298fbef9f61fe
2014-08-04Convert Fn::Select to extended get_attrSteve Baker1-99/+39
Overcloud bootstrap_nodeid is now specified by parameter BootStrapNodeResource with default value controller0. This avoids the need to use Fn::Select on the mergy.py built list of controllers to specify the first controller. Change-Id: Id9cfeab50b90ceeeae51ea0e35997b7495b28cc4 Partial-Blueprint: tripleo-juno-remove-mergepy
2014-08-04Port all templates to HOTSteve Baker1-342/+343
This change was generated and validated by running the following: make hot clean all validate-all This converts all templates to be valid HOT. Fn::Select is not converted in this change but this will actually work with heat_template_version 2013-05-23. Fn::Select is converted manually in the next change in this series. This change also sets the heat_template_version to 2014-10-16 which includes the list_join intrinsic functions used throughout these templates. Partial-Blueprint: tripleo-juno-remove-mergepy Change-Id: Ib3cbb83f6ae94adb7b793ab1b662bd5c55cbb5b3
2014-07-31Add strict dependencies to the overcloud templateNicholas Randon1-0/+1
Currently there is very weak (no) ordering of StructuredDeployments during heat stack creation (and, importantly, update) on the overcloud. This can cause the deployment which sends the completion signal back to Heat to happen before all others have completed, which in turn leads Heat to state the stack is ready while ORC is still configuring services The only workaround to this is to wait an unknown amount of time after the heat stack completes before the system is usable. This patch prevents the completion signal from being returned early, by ensuring these are strictly ordered: controller0Deploy controller0Passthrough controller0AllNodesDeploy NovaCompute0Deploy NovaCompute0Passthrough NovaCompute0AllNodesDeploy Change-Id: I0a549370b7aca55b1145de521ad51218428deaf5
2014-07-31Correct overcloud template to inherit passthroughNicholas Randon1-6/+4
Inherit passthrough from nova-compute-instance.yaml, rather than having an exact copy in overcloud-source.yaml. Change-Id: I4f5a4a7be5835cb68755734aa72f8d9670cba0d4
2014-07-31Rename NovaCompute0Config to NovaCompute0DeployNicholas Randon1-1/+1
Rename NovaCompute0Config to NovaCompute0Deploy as this makes the structured deployment name match the one in nova-compute-instance.yaml. Change-Id: I79f66c09006aa7f7118af1f48e1f6f10b87daec6
2014-07-31controller0AllNodesConfig to controller0AllNodes.Nicholas Randon1-1/+1
Rename all occurrences of controller0AllNodesConfig to controller0AllNodes as this is in line with compute node deployments. Also the current naming is confusing as this is a deployment step not a configuration step. Change-Id: I8efa3b6a64a099e1e8ee43009472152aed5f8ad8
2014-07-25Merge "Fix SSL with HAProxy."Jenkins1-0/+8
2014-07-22Define and bind a public virtual IPJames Polley1-1/+70
Prior to this change our heat templates define one virtual IP, which all the services are bound to. We wish to be able to segregate these endpoints: some need to be accessible to "the public"; some are only intended to be accessed within the cloud; some are only for admin use. This change adds a second VIP which we can use for binding only the endpoints that are intended to be publicly accessible, leaving the older VIP to be used for internal end points. Haproxy is told to also listen on that new VIP so that we can expose selected services via the new VIP, and keepalived is in charge of assigning the VIP to control plane nodes. This change has a proposed split of services between control-only and control+public interfaces. Assuming our yaml parsers (in merge.py and Heat) understand YAML anchors/aliases, and assuming I've got the syntax right, this should get expanded so that all the control+public services get their config defined from the same block without needing to repeat it for each service. (AFAICT both merge.py and heat use pyyaml, which does support aliases/anchors) The default is left at binding to only the controlplane interface, so that new services added to this map will default to being internal-only This patchset partially completes a spec which will one day live at https://blueprints.launchpad.net/tripleo/+specs/tripleo-juno-virtual-public-ips but for now can bee seen in Id9addc65f0d2ed519ce4b3edbd561ed660a2786e Implements: blueprint tripleo-juno-virtual-public-ips Change-Id: I9649ee74ebaf62b6b929b28243a07c789a08867c Co-Authored-By: Robert Collins <rbtcollins@hp.com> Partial-Bug #1325114
2014-07-19Fix SSL with HAProxy.Robert Collins1-0/+8
The current configuration of services is that if SSL is in use (signaled by stunnel.connect_ip) we bind to 127.0.0.1 - which is great, but it breaks simultaneous non-SSL due to there being no pass-through stunnel equivalent on all the nodes. As an interim measure, teach stunnel to connect to the ctlplane address instead. We will need this flexability in future anyway to deal with mixed-mode configurations, but we don't yet have an SSL only configuration. The change will permit SSL only by altering the Deployment object only - the SSL config object should now be flexible enough to run in either mode (but as yet on an all-one-way-or-the-other basis). Change-Id: Ibac3dec1fe7b573029482fdd9ad2d2f6223fbce0
2014-07-18Merge "make keystone.host point to controller_virtual_ip"Jenkins1-1/+1
2014-07-18Merge "Add corosync and pacemaker properties into overcloud template"Jenkins1-0/+11