aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-06-30Merge "Basic support for deploying Ironic in overcloud"Jenkins12-0/+312
2016-06-30Merge "Convert SNMP configuration to composable services format"Jenkins9-74/+35
2016-06-30Merge "Add Management net to ips-from-pool-all example"Jenkins1-0/+16
2016-06-30Merge "Convert noop NetworkExtraConfig to OS::Heat::None"Jenkins2-4/+1
2016-06-30Merge "Increase RabbitMQ maximum file descriptors."Jenkins1-1/+1
2016-06-30Merge "Drop unused VIP params to controller.yaml"Jenkins2-49/+0
2016-06-30Merge "Increase cluster sync timeout for M->N major upgrades"Jenkins1-1/+1
2016-06-29Configure BlockStorage services via resource chainsGiulio Fidente7-151/+112
Wires the steps into the BlockStorage role and ensures the installed-packages list is written on a per-step basis on all roles, as it happens on the controllers already. Change-Id: Iaec8ad3b2afbef6d586b7b46abaa1434cdb62f41
2016-06-29Dump and restore galera db during major upgradesMichele Baldessari3-0/+184
When the overcloud is upgraded we do a yum update of the packages. This step might introduce a newer galera version. In such a situation we need to dump the db and restore it. The high-level workflow should be the following: 1) During the main upgrade step, before shutting down the cluster we need to dump the db 2) We upgrade the packages 3) We briefly start mysql on a single node while making sure that /root/.my.cnf is briefly moved out of the way (because it contains a password) and import the data. After the import we shutdown this mysql instance 4) We let the cluster start up normally The above steps will take place in the following scenarios. Given a locally installed mariadb version X.Y.Z and release R, we will dump and restore the DB under the following conditions: A) MySqlMajorUpgrade template parameter is set to 'auto' and the upgraded package differs in X, Y *or* Z. We basically don't dump automatically if the release field changes. B) MySqlMajorUpgrade template parameter is set to 'yes' When MySqlMajorUpgrade is set to 'no', no dumping will be performed. Note that this will give a non functional upgrade if a major mariadb upgrade is taking place. Partial-Bug: #1587449 Co-Author: Damien Ciabrin <dciabrin@redhat.com> Co-Author: Mike Bayer <mbayer@redhat.com> Depends-On: I8cb4cb3193e6b823aad48ad7dbbbb227364d2a58 Depends-On: I38dcacfabc44539aab1f7da85168fe44a1b43a51 Change-Id: I374628547aed091129d0deaa29764bfc998d76ea
2016-06-29Increase cluster sync timeout for M->N major upgradesDamien Ciabrini1-1/+1
Since the Liberty release, the number of services managed by pacemaker on HA Overcloud has increased. This has an impact on major_upgrade_controller_pacemaker_1.sh, where cluster sync timeout value tuned for older releases is now becoming too low. Raise the cluster sync timeout value to a sensible limit to give pacemaker enough time to stop the cluster during major upgrade. Change-Id: I821d354ba30ce39134982ba12a82c429faa3ce62 Closes-Bug: #1597506
2016-06-29Drop unused VIP params to controller.yamlDan Prince2-49/+0
This patch drops a bunch of unused VIP parameters from controller.yaml Depends-On: I5e2feff7e5dc900849c9535f2b7ac05d3c8f93e1 Change-Id: I5c94f55ac4f2ec1103d5916942fb14e8b5595d01
2016-06-29Convert SNMP configuration to composable services formatSteven Hardy9-74/+35
Change-Id: I7265b0781acefd4a0de687b0465144e57bcc079f Partially-Implements: blueprint composable-services-within-roles
2016-06-29Merge "Fix ceilometer auth url"Jenkins1-1/+2
2016-06-29Merge "Convert swift storage to composable services"Jenkins8-95/+49
2016-06-29Basic support for deploying Ironic in overcloudImre Farkas12-0/+312
Note that this change is not enough yet to deploy bare metal instances, it only deploys Ironic services themselves and makes sure they work. Also it does not support HA for now. Co-Authored-By: Dmitry Tantsur <dtansur@redhat.com> Partially-implements: blueprint ironic-integration Change-Id: I541be905022264e2d4828e7c46338f2e300df540
2016-06-29Merge "Disable stonith temporarily during upgrades"Jenkins1-0/+14
2016-06-29Don't set selinux in 'permissive' mode on CephStorage nodesGiulio Fidente1-2/+0
Change-Id: I469f2bd429eba23b2010b7380e794c67b18e7a47 Depends-On: I1aa46086f69e7c3efd2782da62fd18ade8343fde Partial-Bug: 1595518
2016-06-29Add Management net to ips-from-pool-all exampleSteven Hardy1-0/+16
The recently added Management network is missing from this example Change-Id: Id2010e92b8c27188ed153243d0e54ec50bfdcffb
2016-06-29Convert swift storage to composable servicesSteven Hardy8-95/+49
Depends-On: Ie68d7eccf4938bdbdea93327af0638b3fd002b3e Change-Id: I1eb68d0cd5f8bf4bf954dd9f12941bc493345708 Partially-Implements: blueprint composable-services-within-roles
2016-06-25Convert noop NetworkExtraConfig to OS::Heat::NoneSteven Hardy2-4/+1
This avoids creating an empty nested stack. Change-Id: Icce0bfab005a69fce42f58956dcc81acea805e74
2016-06-24Merge "Add network ExtraConfig hook"Jenkins3-0/+8
2016-06-24Disable stonith temporarily during upgradesMichele Baldessari1-0/+14
It is best if we disable stonith if a cluster has it configured and on, before we call "pcs cluster stop --all", because should a service fail to stop for whatever reason, pacemaker will fence the node where it happened. This is something that we unlikely want during an upgrade as it will make things worse. Once the cluster is stopped we can reenable stonith (if it was enabled to start with) in the CIB while the cluster is shut down. Closes-Bug: #1596065 Change-Id: I38dcacfabc44539aab1f7da85168fe44a1b43a51
2016-06-24Fix ceilometer auth urlPradeep Kilambi1-1/+2
Due to a recent change introduced in puppet ceilometer[1] ceilometer auth type defaults to password type and v2 auth_url doesnt work with domain. This fixes the url to not include suffix. [1] https://review.openstack.org/#/c/320454/ Change-Id: Ibce716825c95e36a942203be2c67ea0da79503f2
2016-06-24Increase RabbitMQ maximum file descriptors.Chris Jones1-1/+1
We now allow 65536 open file descriptors to better reflect the real-world settings of downstream consumers of TripleO. Change-Id: Ib04ea6afb2da1a9101839d9d70bc8891d69700ec
2016-06-23Revert "Ceilometer composable roles for controller"Dan Prince16-380/+277
This reverts commit c48410a05ec0ffd11c717bcf350badc9e5f0e910. We've discovered this patch never had passing CI due to a DLRN build failure. Change-Id: I546cb3e340d20701662affda7e28b586c58ba6de
2016-06-23Allow neutron_options customization for dashboardDimitri Savineau2-2/+2
By default only profile_support can be configured depending of the neutron mechanism driver used (cisco_n1kv). This patch allows to add more neutron options to enable lbaas, vpnaas, etc... Change-Id: I3b3019890a146dd641d6efeb880c5de125d8d132
2016-06-23Revert "Pin puppet-lint-absolute_classname-check to 0.1.3"Emilien Macchi1-2/+1
Bug fixed: https://github.com/voxpupuli/puppet-lint-absolute_classname-check/releases/tag/0.2.2 This reverts commit 61f31831bdafbbddc7b68606832723fe2516872a. Change-Id: I05c2274cd35c187f9e6b2906ee6650cb443cb5fe
2016-06-23Merge "Ceilometer composable roles for controller"Jenkins16-277/+380
2016-06-23Merge "Drop extraconfig for neutron-opencontrail.yaml"Jenkins4-64/+34
2016-06-23Merge "Composable opencontrail plugin"Jenkins7-21/+65
2016-06-23Merge "Drop extraconfig for neutron-nuage.yaml"Jenkins4-93/+49
2016-06-23Merge "Update neutron ml2 class"Jenkins2-2/+2
2016-06-23Ceilometer composable roles for controllerPradeep Kilambi16-277/+380
Depends-On: I4b5e93a108e80e91af26ffee454130ee18c0042e Change-Id: I59c948ead475f449cb8d1b752f39b7eaaf056130
2016-06-22Pin puppet-lint-absolute_classname-check to 0.1.3Emilien Macchi1-1/+2
https://github.com/voxpupuli/puppet-lint-absolute_classname-check/issues/6 Change-Id: Ib0f1ce09b589630c6d09c8588246dafae2f2d387
2016-06-22Update neutron ml2 classEmilien Macchi2-2/+2
Class was moved in with other plugins, it's just an update. Change-Id: I6436c5c36ac0081a720cb8a737a573b1246127a1 Depends-On: I35332df5800083f3373f5c37411534d11e9b4401
2016-06-22Merge "Heat upstream default policy.json works in devstack"Jenkins1-0/+6
2016-06-22Split Heat pacemaker roles into separate servicesBrad P. Crochet4-13/+7
In order for each service to operate independently when used with Pacemaker, the roles needed to be separated. Change-Id: I0440b7b119fc9b7bb3db8a2bf341c0c6db8d3d33 Depends-On: I3fa76562c13191884a53848ad5adcbc9f5a24f61
2016-06-22Merge "Composable roles within services - NTP - CephStorage"Jenkins3-12/+3
2016-06-22Merge "Composable roles within services - NTP - ObjectStorage"Jenkins3-11/+2
2016-06-21Heat upstream default policy.json works in devstackJohn Trowbridge1-0/+6
It does not however work in TripleO, and the ping test is failing with master Heat because of this. I tried submitting a revert[1] in Heat, but they have functional tests, so it is not broken... The only option left is using puppet-heat to override the broken default. [1] https://review.openstack.org/#/c/332206/ Change-Id: I2c674a2e01eeacd17d3158f378be2d6ceeedc309
2016-06-21Composable roles within services - NTP - ObjectStorageCarlos Camacho3-11/+2
Add NTP as a composable service for ObjectStorage. Partially-implements: blueprint composable-services-within-roles Change-Id: I6315abc7955c9dc1df9f211c1c5b7332b5e01d5a
2016-06-21Composable roles within services - NTP - CephStorageCarlos Camacho3-12/+3
Add NTP as a composable service for CephStorage. Partially-implements: blueprint composable-services-within-roles Change-Id: Iee89b261b3c45f596ad84549e25d47b8ca1cfbdb
2016-06-21Composable roles within services - NTP - ComputeCarlos Camacho3-11/+1
Add NTP as a composable service for compute nodes. Partially-implements: blueprint composable-services-within-roles Change-Id: I53958a660830211dee731e0129f4ff018c0cd853
2016-06-21Merge "Composable roles within services - NTP"Jenkins6-15/+30
2016-06-21Merge "Remove nova::db classes, moved to puppet-tripleo"Jenkins2-9/+0
2016-06-21Merge "Remove ::nova::network::neutron, now in puppet-tripleo"Jenkins2-2/+0
2016-06-21Merge "Change Aodh to use own backend"Jenkins4-5/+26
2016-06-21Composable roles within services - NTPCarlos Camacho6-15/+30
Add NTP as a composable service. Also, the scope of this patch is to serve as basis for the blueprint related to the composable services walkthrough. This will be the use case documented. The puppet manifests updated to remove the current configuration for NTP is also added. Change-Id: I1d3d6229d53f48c380e6a775a7c50de8715fe949
2016-06-21Parametrize and increase default of swift-proxy node_timeoutJiri Stransky1-0/+5
We've had problems uploading images on slow virtualized environments, where the requests to swift would time out. The issue has been seen both on undercloud and overcloud. The default timeout is 10 seconds, the issue has been reportedly reproduced on undercloud with node_timeout as high as 30 seconds, but not with 60 seconds yet. Set the default timeout to 60 seconds on overcloud too. Change-Id: I7d486cf4dc9768ddbf71ab71e92db8d2ef29978e Closes-Bug: #1594725
2016-06-21Merge "Composable neutron nuage plugin"Jenkins7-10/+61