aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-01-07Merge "updating enable_ceph conditions for controller"Jenkins3-4/+5
2016-01-07Merge "Adding ManagementIpSubnet to linux bridge net conf"Jenkins1-0/+4
2016-01-07Merge "Use new heat-docker-agents images"Jenkins1-1/+1
2016-01-07Merge "Remove deleted Cinder rows"Jenkins4-5/+21
2016-01-07Merge "Add TimeZone parameter for all node types"Jenkins12-0/+51
2016-01-07Merge "Enable configuration of Neutron QoS"Jenkins3-3/+49
2016-01-06Enable configuration of Neutron QoSBrent Eagles3-3/+49
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 Cinderrajinir5-2/+149
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"Jenkins5-2/+148
2016-01-06Merge "Ensure cluster remains stable during services restarts"Jenkins1-2/+3
2016-01-06Merge "Bump the pacemaker service op_params to 200s for start and stop"Jenkins2-10/+10
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"Jenkins4-13/+17
2016-01-06updating enable_ceph conditions for controllerDan Radez3-4/+5
- 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-05Bump the pacemaker service op_params to 200s for start and stopmarios2-10/+10
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-05Merge "Remove deleted Nova rows"Jenkins4-1/+20
2016-01-05Ensure cluster remains stable during services restartsGiulio Fidente1-2/+3
Using crm_resource --wait we wait for the cluster to get into a stable state before moving into the next step of the piloted restart procedure. Change-Id: I80199653024383fd07900dad0b8d23fb8afade26 Co-Authored-By: Jiri Stransky <jistr@redhat.com>
2016-01-05Use new heat-docker-agents imagesRyan Hallisey1-1/+1
Hosted at tripleoupstream/heat-docker-agents. Change-Id: I2133a7cb789a34c60b87339d816d29d353cb015f
2016-01-05Merge "Network Isolation support for containerized compute"Jenkins4-2/+12
2016-01-05Add TimeZone parameter for all node typesNico Auv12-0/+51
Adds a TimeZone parameter for node types and the top level stack. Defaults to UTC. Change-Id: I98123d894ce429c34744233fe3e631cbdd7c12b5 Depends-On: Icf7c681f359e3e48b653ea4648db6a73b532d45e
2016-01-05Adding ManagementIpSubnet to linux bridge net confJaume Devesa1-0/+4
Because of the new ManagementIpSubnet parameter (introduced by the 15bb6726 commit), the net-config-linux-bridge network configuration file must be updated. Change-Id: I020692eedd9a96e28d0b871e2c27b4f0ee87e3fa
2016-01-05Merge "Wait for cluster to settle in yum_update.sh"Jenkins1-1/+11
2016-01-04Network Isolation support for containerized computeRyan Hallisey4-2/+12
The template will all neutron-agents to be configured so that it can run the network isolation templates on the containerized compute node. Co-Authored-By: Dan Prince <dpince@redhat.com> Change-Id: I7837ed7ed3e807ec5c1276904893695918bef293
2016-01-04Merge "Convert JSON generations from bash to python"Jenkins2-108/+101
2016-01-04Wait for cluster to settle in yum_update.shJiri Stransky1-1/+11
Occasionally we hit "Error: unable to push cib" during update. This is probably due to the fact that when we try to replace cib in yum_update.sh, services on the previous updated controller are still coming up and changing cib, and racing/conflicting with the cib push from yum_update.sh. This commit adds waiting for the cluster to settle before exiting from yum_update.sh, to avoid this kind of conflict. Also a check for cib-push success is added, to make the update fail properly instead of hanging indefinitely as we've observed with this issue. Change-Id: I953087e0e565474ac553fd57bea2459d2e3a6081 Closes-Bug: #1527644
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"Jenkins2-6/+33
2015-12-23Merge "Add all isolated networks to all nodes."Jenkins6-0/+113
2015-12-23Merge "Add Management Network For System Administration."Jenkins38-13/+576
2015-12-23Merge "Remove unsafe "unset" defaults"Jenkins5-39/+0
2015-12-22Merge "Fix description of control plane route parameter"Jenkins5-5/+5
2015-12-22Merge "Add sample environment file to document usage of predictable IPs"Jenkins1-0/+20
2015-12-22Merge "MidoNet heat templates"Jenkins7-36/+352
2015-12-21Merge "Add SoftwareConfigTransport for switching transports"Jenkins5-0/+40
2015-12-21MidoNet heat templatesJaume Devesa7-36/+352
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 Sneddon6-0/+113
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 Sneddon38-18/+581
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 Fidente4-13/+17
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"Jenkins2-2/+2
2015-12-18Merge "Allow for usage of pre-allocated IPs for the controller nodes"Jenkins20-19/+379
2015-12-17Convert JSON generations from bash to pythonRyan Hallisey2-108/+101
Python script in the heat template will handle JSON generation for the containers. Change-Id: I296fd4a4948f3f937e3a108bc926af6415b350c4
2015-12-17Merge "Add fixup for pcs order constraints after update to new templates"Jenkins1-0/+6
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"Jenkins6-147/+128
2015-12-15Add capabilities mapJiri Tomasek1-0/+226
This file holds metadata about the capabilities of the tripleo-heat-templates repository for deployment using puppet. It groups configuration by topic, describes possible combinations of environments and resource capabilities It's main purpose is to provide relevant information to the user to guide him through the deployment options. tripleo-common can use this information to streamline deployment process on environment and resource registry level. Heat templates themself aren't currently able to provide this information. Change-Id: I82a7ba6defc13ac2efae73a6caa36bfee69dd94b
2015-12-15Add fixup for pcs order constraints after update to new templatesmarios1-0/+6
In https://review.openstack.org/#/c/248572/ yum_update.sh sets the pcs constraints before restarting the cluster. However after post-update pacemaker run, the previous constraint of neutron-server...neutron-ovs-cleanup is re-added. Explicitly remove this before the post-update restart of certain services Change-Id: I84dd650dcc66ce3f48926cf369b7d691014c2254
2015-12-15Merge "Pacemaker maintenance mode for the duration of Puppet run on update"Jenkins9-1/+186
2015-12-15Wire Neutron ML2 plugin and OVS agent settings as arraysGiulio Fidente6-147/+128
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-15Fix description of control plane route parameterJiri Stransky5-5/+5
In the other templates this seems to be already correct. Change-Id: Ied3c49cca878bd370068c9b8d1cafdec176c1725