summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-09-30Merge "Remove unnecessary completion signal"Jenkins1-1/+0
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
2014-08-30Change | to > in templates.Robert Collins2-8/+8
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."Jenkins6-3/+110
2014-08-29Remove unused Neutron valuesJames Slagle2-14/+0
These Neutron parameters are not actually needed or used on a Swift Storage instance. neutron-openvswitch-agent does not even need to be present on a Swift node. Change-Id: I5d61cc1d22a719b186e6d89baaf25f119e0416d7
2014-08-28Expose public_interface_tag support.Robert Collins6-3/+110
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 Collins4-0/+25
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 "Make Swift replica count configurable."Jenkins3-1/+11
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"Jenkins3-0/+5
2014-08-25Merge "Make signal_transport a parameter"Jenkins3-0/+23
2014-08-22Set vnc to use controller virtual_ipRyan Moore3-0/+5
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-20Merge "Remove hardcoded version."Jenkins1-1/+0
2014-08-20Remove hardcoded version.Robert Collins1-1/+0
We use semantic versioning, not pbr's pre-version facility. This line causes local package builds to have the wrong version, and pbr will in future detect this and error. Change-Id: Ia625d31e87d137e867badcdeac1f33630257bb8c
2014-08-19Merge "Set the MySQL root password"Jenkins2-0/+10
2014-08-18Make signal_transport a parameterClint Byrum3-0/+23
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 "Fix bash env var conditionals in merge.py call to be consistent"Jenkins0-0/+0
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