summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-08-18Merge "Make BlockStorage deployment dependent on controller0AllNodes"Jenkins1-0/+1
2014-08-18Merge "Ensure glance.host and glance.cinder are set for BlockStorage nodes"Jenkins1-0/+3
2014-08-18Merge "Rename NovaCompute resources suffix to be consistent with controller"Jenkins2-9/+9
2014-08-17Ensure glance.host and glance.cinder are set for BlockStorage nodesGiulio Fidente1-0/+3
Change-Id: I03056681b795a2078a678dcb0cd29002310e5843 Related-bug: 1351110
2014-08-17Make BlockStorage deployment dependent on controller0AllNodesGiulio Fidente1-0/+1
As per the NovaCompute nodes, this change makes deployment of BlockStorage nodes dependent on controller0AllNodes. Change-Id: I4bc4d33d42463a0abadc2bfd4e48b1a4e554d396
2014-08-15Merge "Use VIP for rabbit/keystone and mysql in block-storage.yaml"Jenkins1-3/+3
2014-08-15Merge "Remove unneeded neutron config parts from block-storage.yaml"Jenkins1-16/+0
2014-08-15Merge "Add strict dependencies to the undercloud template"Jenkins4-6/+9
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-14Use VIP for rabbit/keystone and mysql in block-storage.yamlGiulio Fidente1-3/+3
Previously BlockStorage nodes were using the controller ip instead of the virtual ip to reach rabbit, keystone and mysql. Change-Id: I23f87511e59d4d3527403b1a81c1b3df65c6a904
2014-08-14Remove unneeded neutron config parts from block-storage.yamlGiulio Fidente1-16/+0
Some of the keys defined in block-storage.yaml for neutron and passed to the BlockStorage nodes were related to neutron, but BlockStorage nodes do not route instances traffic so do not need to be deployed with the OVS agent. Change-Id: Icc7d5ea0d91370ccdf7cb4742d052fea004bae44
2014-08-14Merge "Add BlockStorage and SwiftStorage nodes into hosts"Jenkins1-0/+24
2014-08-14Merge "Fix BLOCKSTORAGESCALE and SWIFTSTORAGESCALE in Makefile"Jenkins1-2/+2
2014-08-14Add strict dependencies to the undercloud templateNicholas Randon4-6/+9
Currently there is very weak ordering of StructuredDeployments during heat stack creation on the undercloud. 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: undercloudIronicDeployment (if used) undercloudNovaDeployment undercloudPassthroughDeployment undercloudDeployment Note: The reference numbering for the undercloud has been removed. Change-Id: I98499dd54bb907d29cf355fe83b5c285a7375e97
2014-08-13Merge "Make removing nodes from scaled items possible."Jenkins3-8/+384
2014-08-13Switch to heat_template_version: 2013-05-23Steve Baker13-67/+67
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 Kreger3-12/+70
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-12Move cacert property out of "stunnel" and into a new "ssl" groupJonathan Brownell1-0/+3
The CA certificate is currently passed via ssl-source.yaml as "stunnel.cacert", but this value is not currently used by stunnel since we have no use case for client cert authentication. This change proposes that it also be exposed as "ssl.ca_certificate", which is consistent with the overall SSL direction being driven by the PKI spec: I32473fe797a4c1e28d14c3b82c8892c7c59a4e55 This new CA certificate value will be installed as a trusted CA on all cloud nodes that issue SSL-secured connection requests to OpenStack or other infrastructure (MySQL, RabbitMQ) services. Change-Id: Ibacd7c98980520e11c0df89632013f2ba2dbe370
2014-08-12Merge "Restore rabbit.host and add an haproxy rabbit listener"Jenkins3-0/+11
2014-08-12Make removing nodes from scaled items possible.Robert Collins3-8/+384
This makes it possible to remove a dead node (e.g. if NovaCompute2 has failed, regenerate the template with ,2 in the scale parameter, and NovaCompute2 will not be enumerated. Change-Id: I65d85a88152ed4adee60895173f8a05611a6440b
2014-08-10Merge "Fix overcloud controller scaling"Jenkins2-6/+24
2014-08-08Restore rabbit.host and add an haproxy rabbit listenerGiulio Fidente3-0/+11
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-08Merge "Use VIP for keystone host in swift template"Jenkins1-1/+1
2014-08-08Merge "fix incorrect reference to rabbit_username"Jenkins1-1/+1
2014-08-08Merge "Move config options under neutron.ovs"Jenkins2-2/+4
2014-08-07Merge "Set basic pacemaker and corosync properties in undercloud"Jenkins1-0/+11
2014-08-07Fix overcloud controller scalingTomas Sedovic2-6/+24
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-06Use VIP for keystone host in swift templateJan Provaznik1-1/+1
As a side effect this fixes invalid keystone host generation when multiple controller nodes are used. Change-Id: I081976f0da94fc0232dfa2c34de03bbb4abf1a85
2014-08-06Set basic pacemaker and corosync properties in undercloudJan Provaznik1-0/+11
Because services which depend on pacemaker (ceilometer central agent and neutron services) are used in undercloud too, we need to set basic pacemaker and corosync metadata for undercloud. Related to: Ifa83d62c2132bcdcb40d0b7c80ce3adadc0b5587 Related to: I63f054a8c80f9f676a77341c89e605b5b472d078 Change-Id: Icc97e36a1db198b973041346cf2056f68de661a2
2014-08-06Rename NovaCompute resources suffix to be consistent with controllerGiulio Fidente2-9/+9
This change renames a few NovaCompute resources so that the naming is consistent with the controller resources naming choice. Change-Id: I8c22867b208c5e16fd52bb3157f838f762b71470
2014-08-05Move config options under neutron.ovsJames Slagle2-2/+4
These config options are supposed to be under neutron.ovs (see template for neutron openvswitch agent). They were mistakenly moved to be just under neutron when the migration to SoftwareConfig was done. Change-Id: I5769dc1dc501d48c965f8e4e36238cfcaac64a17
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-05Fix BLOCKSTORAGESCALE and SWIFTSTORAGESCALE in MakefileGiulio Fidente1-2/+2
The BLOCKSTORAGESCALE and SWIFTSTORAGESCALE vars were incorrectly ignored in the Makefile (and forcibly set to 0) Change-Id: I37614153d8c87d25aa17e759fcd228a8a1fda4a4
2014-08-05Remove duplicate config section from block-storage.yamlGiulio Fidente1-26/+0
Deletes a duplicate config section from file block-storage.yaml (and a duplicate admin-password key too). Change-Id: I226517ea467751d00dbf217a6b6e4e0839538225
2014-08-04fix incorrect reference to rabbit_usernameGiulio Fidente1-1/+1
Fixes a typo in nova-compute-config.yaml file where rabbit_username was mistakenly written as rabbit_user_name; compute nodes received null as rabbit username as consequence. Change-Id: I796b9bdccd1863647a667edbbc96731fc924c55d
2014-08-04Convert Fn::Select to extended get_attrSteve Baker12-335/+182
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 Baker37-1134/+1136
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-08-01Merge "Remove ImageBuilder::Elements from templates"Jenkins2-9/+0
2014-08-01Merge "Fix swift memcache and device properties"Jenkins2-79/+56
2014-08-01merge.py --hot to process and generate HOTSteve Baker25-5/+1000
This adds a --hot flag to merge.py which will assume source templates are in the HOT format, and generate a HOT template artifact. Tests have also been ported to HOT, along with some minor corrections to the existing tests to make the source and result templates valid heat templates. Partial-Blueprint: tripleo-juno-remove-mergepy Change-Id: If18ff79f89456123c884a1ab2f910ce4cc9a6e0b
2014-07-31Add strict dependencies to the overcloud templateNicholas Randon2-1/+4
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-31Merge "Remove nova-compute-group.yaml"Jenkins1-67/+0
2014-07-30Fix swift memcache and device propertiesJan Provaznik2-79/+56
All controller nodes are added into the list of swift devices and into the list of memcache servers. This patch also removes swift storage nodes from the list of memcache servers - I don't think that each storage node should run proxy server (also swift-storage element doesn't depend on swift-proxy). Change-Id: Idb2ce2e2050fb84d8f8b564626b20e7b059fd685
2014-07-28Merge "Add signal_transport property"Jenkins1-0/+1
2014-07-28Merge "Add user_data_format"Jenkins1-0/+1
2014-07-28Remove nova-compute-group.yamlAlexis Lee1-67/+0
This file is not used. Change-Id: Ic03fb3402b3164c7c99cf02040f3a5e5abf6a9e9
2014-07-25Merge "Fix SSL with HAProxy."Jenkins2-0/+24