summaryrefslogtreecommitdiffstats
path: root/puppet
AgeCommit message (Collapse)AuthorFilesLines
2016-01-18Fix tunnel_types hieradata on compute nodesBen Nemec1-1/+1
There was a missing : in the hieradata for the compute nodes that caused tunnel_types to not be configured. This also made it impossible to boot instances on tunneled networks because the port binding always failed. Change-Id: Icc2a45aa9514ce62497f91e6abe9261d1c1374ed Partial-Bug: 1534349
2016-01-18Fix neutron-nova notificationsBen Nemec1-1/+2
In our neutron.conf we configure both keystone v2 and v3 options, which confuses the keystoneclient code responsible for deciding which to use. For whatever reason, having it talk to the unversioned keystone endpoint and letting the client decide which version that way makes it happy. Except that we write a wrong value for project_name, which makes it unhappy again. This change fixes both of those issues, which allows notifications to work again. Change-Id: Ic3a329354d0ed071363183b5e06c0a42d2dd84ad Closes-Bug: 1519525
2016-01-13Merge "Use pymysql database driver for OpenStack DBs"Jenkins2-8/+8
2016-01-12Merge "Sahara Integration"Jenkins7-0/+103
2016-01-11Use pymysql database driver for OpenStack DBsEmilien Macchi2-8/+8
PyMySQL is a new driver introduced in Liberty. This patch change the MySQL url to use mysql+pymysql like recommanded. Change-Id: I28e14acacba865241a0cc388a879a003181a85f3 Depends-On: I7604cca9e2d7bf0b93c820adec5f937f72b64fa8 Closes-Bug: #1499298
2016-01-08Sahara IntegrationEthan Gafford7-0/+103
Integration of OpenStack data processing service (sahara) with TripleO. - Deploys sahara in distributed mode (separate api and engine processes on each controller node) - Load balancing w/haproxy - RabbitMQ/MySQL supported per current TripleO standard - Minimal configurability at this time Change-Id: I77a6a69ed5691e3b1ba34e9ebb4d88c80019642c Partially-implements: blueprint sahara-integration Depends-On: I0f0a1dc2eaa57d8226bad8cfb250110296ab9614 Depends-On: Ib84cc59667616ec94e7edce2715cbd7dd944f4ae Depends-On: I9fe321fd4284f7bfd55bd2e69dcfe623ed6f8a2a
2016-01-08Switch for Keystone DB cron jobMartin Mágr4-2/+16
- Adds parameter to enable switching off token flush cron job. - Sets destination for deleted rows to /dev/null Change-Id: I9e8aed969e81595d8a1d0a5300da17da6ba15c03 Partial-bug: rhbz#1249106 Depends-On: I5e51562338f68b4ba1b2e942907e6f6a0ab7a61e
2016-01-08Merge "Add ExtraConfig to cinder storage role"Jenkins1-0/+8
2016-01-07Merge "updating enable_ceph conditions for controller"Jenkins2-2/+2
2016-01-07Merge "Remove deleted Cinder rows"Jenkins4-5/+21
2016-01-07Merge "Add TimeZone parameter for all node types"Jenkins11-0/+42
2016-01-07Merge "Enable configuration of Neutron QoS"Jenkins2-2/+35
2016-01-06Enable configuration of Neutron QoSBrent Eagles2-2/+35
This change adds support for setting the configuration options required to enable the quality of service feature in Neutron. The default values will enable the feature. Closes-Bug: #1524052 Depends-On: Iefc289a6eee13b9c66f8131c258af982f232df4b Change-Id: I1abf7d37d39e6927e482b56de4ee3d3d7c313a1c
2016-01-06Enable Dell Storage Center iscsi Backends in Cinderrajinir4-2/+132
Enables support for configuring Cinder with a Dell Storage Center iscsi storage backend. This change adds all relevant parameters for: - Dell Storage Center SC Series (iSCSI) Change-Id: I3b1a4346f494139ab123c7dc1a62f81d03c9e728
2016-01-06Merge "Enable Equallogic Backends in Cinder"Jenkins4-2/+131
2016-01-06Merge "Bump the pacemaker service op_params to 200s for start and stop"Jenkins1-8/+8
2016-01-06Remove deleted Cinder rowsMartin Mágr4-5/+21
Creates cron job running every 24 hours for "cinder-manage db purge" Partial-bug: rhbz#1249106 Change-Id: I9156e0bf1401eda49a7c9a2921dc3a8723af026d Depends-On: I677f2ef3d9ca81fff0f672c8e34b6e4278674a96
2016-01-06Merge "Align template defaults with the client"Jenkins2-4/+4
2016-01-06updating enable_ceph conditions for controllerDan Radez2-2/+2
- keeping enabled based on ceph node count being greater than 0 - adding enabled if ControllerEnableCephStorage is true Intention here is to be able to run ceph without having dedicated nodes for. Enabling Ceph alternativly from the ControllerEnableCeph parameter allows ceph to be colocated on the controllers without having to run any dedicated ceph nodes. Change-Id: I71062d37226c679156380c0f4e194b51cb586bcf Signed-off-by: Dan Radez <dradez@redhat.com>
2016-01-05Add ExtraConfig to cinder storage roleJames Slagle1-0/+8
The ExtraConfig resource was missing from the cinder storage role. Adding it for consistency. Change-Id: I05ad33c113af6f67ded7699976103508c47a3f1a
2016-01-05Bump the pacemaker service op_params to 200s for start and stopmarios1-8/+8
Based on observed timeouts during updates bump the stop and start timeouts for pacemaker service resources (via op_params) to 200. This is based on the reasoning that the full timeout may be as long as two elapsed timeout intervals. After an initial timeout, the sigterm that follows is then allowed another DefaultTimeoutStopSec seconds. The 200s is produced by allowing this 2xDefaultTimeoutStopSec (@90s for systemd) and some scheduling delta. Many thanks to Michele Baldessari. Closes-Bug: 1531204 Change-Id: If6b43982c958f63bc78ad997400bf1279c23df7e
2016-01-05Add TimeZone parameter for all node typesNico Auv11-0/+42
Adds a TimeZone parameter for node types and the top level stack. Defaults to UTC. Change-Id: I98123d894ce429c34744233fe3e631cbdd7c12b5 Depends-On: Icf7c681f359e3e48b653ea4648db6a73b532d45e
2016-01-04Remove deleted Nova rowsMartin Mágr4-1/+20
Creates cron job running every twelve hours for "nova-manage db archive_deleted_rows" Partial-bug: rhbz#1249106 Depends-On: Ic674f4d39bc88f89abfeb0ce99a571c2534e57e4 Change-Id: I4740cc02aa9714f48798521fe9918ac3487db031
2015-12-29Merge "Enable TLS in loadbalancer if cert path is detected"Jenkins1-6/+1
2015-12-23Merge "Add all isolated networks to all nodes."Jenkins4-0/+93
2015-12-23Merge "Add Management Network For System Administration."Jenkins5-0/+52
2015-12-23Merge "Remove unsafe "unset" defaults"Jenkins4-25/+0
2015-12-22Merge "MidoNet heat templates"Jenkins6-36/+332
2015-12-21Merge "Add SoftwareConfigTransport for switching transports"Jenkins5-0/+40
2015-12-21MidoNet heat templatesJaume Devesa6-36/+332
Deploy a TripleO overcloud with networking midonet. MidoNet is a monolithic plugin and quite changes on the puppet manifest must be done. Depends-On: I72f21036fda795b54312a7d39f04c30bbf16c41b Depends-On: I6f1ac659297b8cf6671e11ad23284f8f543568b0 Depends-On: Icea9bd96e4c80a26b9e813d383f84099c736d7bf Change-Id: I9692e2ef566ea37e0235a6059b1ae1ceeb9725ba
2015-12-18Add all isolated networks to all nodes.Dan Sneddon4-0/+93
This change allows every overcloud node to optionally participate in any of the isolated networks. The optional networks are not enabled by default, but allow additional flexibility. Since the new networks are not enabled by default, the standared deployment is unchanged. This change was originally requested for OpenDaylight support. There are several use cases for using non-standard networks. For instance, one example might be adding the Internal API network to the Ceph nodes, in order to use that network for administrative functions. Another example would be adding the Storage Management network to the compute nodes, in order to use it for backup. Without this change, any deviation from the standard set of roles that use a network is a custom change to the Heat templates, which makes upgrades much more difficult. Change-Id: Ia386c964aa0ef79e457821d8d96ebb8ac2847231
2015-12-18Add Management Network For System Administration.Dan Sneddon5-0/+52
This change adds a system management network to all overcloud nodes. The purpose of this network is for system administration, for access to infrastructure services like DNS or NTP, or for monitoring. This allows the management network to be placed on a bond for redundancy, or for the system management network to be an out-of-band network with no routing in or out. The management network might also be configured as a default route instead of the provisioning 'ctlplane' network. This change does not enable the management network by default. An environment file named network-management.yaml may be included to enable the network and ports for each role. The included NIC config templates have been updated with a block that may be uncommented when the management network is enabled. This change also contains some minor cleanup to the NIC templates, particularly the multiple nic templates. Change-Id: I0813a13f60a4f797be04b34258a2cffa9ea7e84f
2015-12-18Align template defaults with the clientGiulio Fidente2-4/+4
This aligns the parameter default values from python-tripleoclient with tripleo-heat-templates. This is in preparation for removing all the defaults from the client, and maintaining them only in the templates. Change-Id: I7b635a250f1ecc170e18d8e434f0118c6fcbb942 Co-Authored-By: James Slagle <jslagle@redhat.com>
2015-12-18Merge "Fix typo in HostsEntry output description"Jenkins1-1/+1
2015-12-18Merge "Allow for usage of pre-allocated IPs for the controller nodes"Jenkins1-0/+19
2015-12-17Merge "pacemaker: run neutron-server-start-wait-stop only at step 4"Jenkins1-9/+26
2015-12-17Merge "Implement Workers parameters"Jenkins1-0/+54
2015-12-16Merge "Wire Neutron ML2 plugin and OVS agent settings as arrays"Jenkins5-137/+120
2015-12-15Merge "Pacemaker maintenance mode for the duration of Puppet run on update"Jenkins2-1/+31
2015-12-15Wire Neutron ML2 plugin and OVS agent settings as arraysGiulio Fidente5-137/+120
Wires the following as arrays to the neutron module: - mechanism_drivers - flat_networks - tenant_network_types - tunnel_types - bridge_mappings Also updates the template version to use a Liberty feature which allows serialization of comma_delimited_list into JSON. Tidies up the manifests by removing the class declarations since config is passed by the puppet/controller+compute hiera mapped_data. Change-Id: Ie9f85fb827099f897ef750e267bc3ed3a864fe59 Co-Authored-By: Steven Hardy <shardy@redhat.com>
2015-12-15Allow for usage of pre-allocated IPs for the controller nodesGiulio Fidente1-0/+19
This change adds a new *_from_pool.yaml meant to return an IP from a list instead of allocating a Neutron port, useful to pick an IP from a pre-defined list and making it possible to configure, for example an external balancer in advance (or dns), with the future IPs of the controller nodes. The list of IPs is provided via parameter_defaults (in the ControllerIPs struct) using ControllerIPs param. Also some additional VipPort types are created for the *VirtualIP resources. The VIPs were previously created using the same port resource used by the nodes, but when deploying with an external balancer we want the VIP resource to be nooped instead. Change-Id: Id3d4f12235501ae77200430a2dc022f378dce336
2015-12-15Merge "Set swift replicas = min(device_count, replicas)"Jenkins1-1/+1
2015-12-14Merge "Fix wrong keypair parameter description"Jenkins5-5/+5
2015-12-15Fix typo in HostsEntry output descriptionJuan Antonio Osorio Robles1-1/+1
Change-Id: I72a79d8200adee8258033e8da370051bbfd1986b
2015-12-14Merge "Add output for host entries"Jenkins1-0/+6
2015-12-14Set swift replicas = min(device_count, replicas)Dan Prince1-1/+1
Per Swift upstream commit: 7035639dfd239b52d4ed46aae50f78d16ec8cbfe Swift's ringbuilder now validates that the number of devices is greater than or equal to the replicas. Change-Id: I56eaa9ddda138e87f7615d3bde797b568fa5e302 Related-bug: #1525356
2015-12-14Merge "Enable per-role SchedulerHints"Jenkins5-3/+25
2015-12-14Pacemaker maintenance mode for the duration of Puppet run on updateSteven Hardy2-1/+31
This enables pacemaker maintenantce mode when running Puppet on stack update. Puppet can try to restart some overcloud services, which pacemaker tries to prevent, and this can result in a failed Puppet run. At the end of the puppet run, certain pacemaker resources are restarted in an additional SoftwareDeployment to make sure that any config changes have been fully applied. This is only done on stack updates (when UpdateIdentifier is set to something), because the assumption is that on stack create services already come up with the correct config. (Change I9556085424fa3008d7f596578b58e7c33a336f75 has been squashed into this one.) Change-Id: I4d40358c511fc1f95b78a859e943082aaea17899 Co-Authored-By: Jiri Stransky <jistr@redhat.com> Co-Authored-By: James Slagle <jslagle@redhat.com>
2015-12-12Add SoftwareConfigTransport for switching transportsSteve Baker5-0/+40
This change adds a SoftwareConfigTransport parameter to role templates so that the transport can be changed via a parameter_defaults entry. This change will have no effect on an existing overcloud as the current default POLL_SERVER_CFN is now explicit in the parameter default. Change-Id: I5c2a2d2170714093c5757282cba12ac65f8738a4
2015-12-10pacemaker: run neutron-server-start-wait-stop only at step 4Emilien Macchi1-9/+26
neutron-server-start-wait-stop is a dangerous Exec that is exposed to race conditions, because it does not have "onlyif" or "unless" statements. That means during a deployment, this exec can be run in the wrong order during Step 5 and/or 6, while it was supposed to be run at Step 4 only. If that happens, the exec will fail because puppet tries to start neutron-server while Pacemaker already started the resource. So in that case, systemd would returns 1 to Puppet which would return 6 to the overcloud deployment and the deployment would fail to finish correctly. This patch aims to prevent from this scenario by making sure we run the exec only during the step 4. Also, in order to secure it a bit more, we add 'unless' statement to this exec, so we would make sure the Puppet run would be idempotent and the Exec would run one successful time only. https://bugzilla.redhat.com/show_bug.cgi?id=1290582 Change-Id: I42813c5cff6c525c15c9c24baad4e355f88af672