aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-07-11Merge "neutron: remove tenant MTU configuration options"Jenkins4-58/+1
2016-07-11Merge "Move ironic::db data within service template"Jenkins4-13/+8
2016-07-11Missing CephClientKey parameter in puppet-ceph-devel and storage-environmentMarius Cornea2-0/+3
This change adds the CephClientKey parameter to puppet-ceph-devel.yaml and storage-environment.yaml environment files. This is needed when --ceph-storage is not passed to the openstack overcloud deploy command as the tripleo client doesn't generate the keys. Change-Id: Idfdce190c2ad4ae198fe17474aee19cb76dac5fb Closes-Bug: #1601864
2016-07-11Re-enable Ceilometer composable roles for controllerEmilien Macchi16-286/+385
This patch brings back Ceilometer composable roles for controller, module some adjustments to make it work. Fixes 3 issues in Ceilometer composable services 1) This patch fixes the hiera maps in the pacemaker ceilometer* templates. These were lists and should be a map. 2) fixes a critical issue in ceilometer-base.yaml where the password was incorrectly coded in the YAML using get_param on a string which wasn't actually a parameter. 3) Fixes the ceilometer_coordination_url so that it uses a YAML anchor as was implied instead of get_param on a string which wasn't a parameter. 4) Fixes the default database connection to use mongodb and configured in puppet-tripleo profile appropriately. Co-Authored-By: Dan Prince <dprince@redhat.com> Co-Authored-By: Pradeep Kilambi <pkilambi@redhat.com> Closes-Bug: #1601844 Change-Id: Ia0a59121b9ffd5e07647f66137ce53870bc6b5d6
2016-07-11Add a second proxy-logging middleware entry to swift-proxyDerek Higgins1-0/+1
Its absence results in swift using up all the memory available to it when certain objects are requested, we are not sure exactly what triggers the problem but we know this fixes it. Change-Id: Iaf00a8a2a947e0683cc60fef2e75fd7c444d07a8 Closes-Bug: #1595916
2016-07-11Repurpose KeystoneWorkers add keystone::wsgi::apache::threadsmarios1-7/+7
Now that keystone is run with wsgi apache the KeystoneWorkers param has no efffect [1]. This repurposes KeystoneWorkers to now set wsgi::apache::workers and adds the keystone::wsgi::apache::threads hardcoding to 1 (can overrride via extraconfig data) [1] https://github.com/openstack/puppet-keystone/blob/51c68fb127c28b9748b352871783c3ec6ef5c83b/manifests/init.pp#L396 Closes-Bug: 1598092 Change-Id: I503d1f0d3f4c56abfaf4609ea8290e78668013b6
2016-07-11Merge "Include bulk in swift proxy pipeline"Jenkins1-0/+1
2016-07-11Move ironic::db data within service templateGiulio Fidente4-13/+8
Change-Id: If0b8fbc783e694f4f744ad848103d40df985fc04
2016-07-11Merge "Move neutron::db data within service template"Jenkins2-10/+7
2016-07-11Merge "Move sahara::db data within service template"Jenkins2-8/+6
2016-07-11Merge "Move heat::db data within service template"Jenkins2-8/+6
2016-07-11Merge "Move cinder::db data within service template"Jenkins2-8/+6
2016-07-11Merge "Move glance::db data within service template"Jenkins2-8/+7
2016-07-11Merge "Move keystone::db data within service template"Jenkins2-8/+7
2016-07-11Merge "Pass MysqlVirtualIP without brackets to EndpointMap"Jenkins3-0/+48
2016-07-11Merge "Set os-refresh-config timeout to 4 hours"Jenkins5-5/+5
2016-07-11Merge "Template param for what command occ runs"Jenkins5-0/+35
2016-07-09Move neutron::db data within service templateGiulio Fidente2-10/+7
Change-Id: I07a81a2e1cc29df007bba11da82cf6661a55aadf
2016-07-09Move sahara::db data within service templateGiulio Fidente2-8/+6
Change-Id: Ifb87f79e8cd692e6553d03df8394c74f51821e11
2016-07-09Move heat::db data within service templateGiulio Fidente2-8/+6
Change-Id: I3fada6c5b0265bc6536c89da0ef4b709ead13b7d
2016-07-09Move cinder::db data within service templateGiulio Fidente2-8/+6
Change-Id: I2aaf30289cc792e8860ca9c962d80baf7e804cbf
2016-07-09Move glance::db data within service templateGiulio Fidente2-8/+7
Change-Id: I405bc9895160cc867f933e6b0d56546d460d2e3a
2016-07-08Composable Midonet for NeutronDan Prince7-160/+80
Depends-On: I2393fc3c360f5f5786411f64dbcd06f380376093 Change-Id: I606cb1f7ef7d651b5d145bfa10ef3aa1561b1590 Partially-implements: blueprint composable-services-within-roles
2016-07-08Include bulk in swift proxy pipelinePradeep Kilambi1-0/+1
With bulk delete enabled for gnocchi, this option should be included in pipeline as well. Change-Id: I5786c6f14e3aab9e167c22d8f72c5c1688440e95
2016-07-08Move keystone::db data within service templateGiulio Fidente2-8/+7
Change-Id: I934aff4960588a3957b7a7bcc90385ae48d34d1e
2016-07-08Pass MysqlVirtualIP without brackets to EndpointMapGiulio Fidente3-0/+48
While the endpoints do need brackets around IPv6 addresses these are not wanted by some of the puppet classes so we must pass the non bracketed version as well. It will allow us to remove the need for the MysqlVirtualIP param passed to the controller role thouh when hieradata/database.yaml is emptied. Change-Id: If264b02a134b96368035f032e05d02e84f6499ed
2016-07-08Add StepConfig to docker compute-post.yamlFlavio Percoco1-1/+10
Change I84c97a76159704c2d6c963bc4b26e365764b1366 missed `docker/compute-post.yaml`. Change-Id: I680eabf2f316c7fccc9d53d75dc16139c9959c64
2016-07-08Merge "Parametrize and increase default of swift-proxy node_timeout"Jenkins1-0/+5
2016-07-07Merge pacemaker_master/sync_db conditionalsGiulio Fidente1-40/+38
By condensing the pacemaker_master and sync_db conditions we ensure there won't be unrelevant (clustercheck) execs deployed on non-bootstrap nodes. Closes-Bug: 1598907 Change-Id: Iae6aa13682d63096265f4751b2f71019a49f6fa6
2016-07-07Merge "Convert AllNodesExtraConfig to OS::Heat::None"Jenkins2-26/+2
2016-07-07Merge "Remove config_identifier from all_nodes extraconfig examples"Jenkins7-42/+3
2016-07-07Merge "Restore the NtpServer parameter name"Jenkins1-3/+3
2016-07-06Merge "Add kernel service"Jenkins9-38/+24
2016-07-06Merge "Allow neutron_options customization for dashboard"Jenkins2-2/+2
2016-07-06Restore the NtpServer parameter nameDan Prince1-3/+3
In 296bffde893dbbf36c62d664e24e2584b89b8070 we moved the NTP into a composable service but changed the name of the parameter to NtpServers. This will break upgrades for users of the previous parameter name. Closes-bug: #1599526 Change-Id: I896b9427416f01b603ac9cc4d8c9ebf5e019cb32
2016-07-05Merge "Split Heat pacemaker roles into separate services"Jenkins4-13/+7
2016-07-05Merge "pacemaker: don't override Service resource for Nova & Neutron"Jenkins1-3/+1
2016-07-05Convert AllNodesExtraConfig to OS::Heat::NoneSteven Hardy2-26/+2
Instead of creating a nested stack, as it's slightly lower overhead and will make things easier when adding custom roles (where a hard-coded default template can't work) Change-Id: If9f8294ba477d1c1364e19a52152905a2c02e959
2016-07-05Remove config_identifier from all_nodes extraconfig examplesSteven Hardy7-42/+3
Since https://review.openstack.org/#/c/315616 this is no longer required. Change-Id: I0452d1577a25d19b4351bfe7830a6c7bbe485e67
2016-07-05Merge "Use create-legacy-resource-types during gnocchi-upgrade"Jenkins1-1/+1
2016-07-05neutron: remove tenant MTU configuration optionsIhar Hrachyshka4-58/+1
Since Mitaka, Neutron and Nova do the right thing for MTU, correctly calculating and applying MTU per network, considering its network type and underlying physical network MTU (1500 by default). Neutron now also correctly advertise proper MTU to instances through DHCP and RA mechanisms. With that, there is no reason to have those MTU hacks in deployment tools. Actually, they not only do no good, but break some setups (Jumbo frame aware infrastructure), or at least make them non-optimal (lowering instance MTU to 1400 when it's not needed, or when tunnel overhead does not require 100 bytes). Note that Neutron still has a set of configuration options to allow for custom physical network MTUs (global_physnet_mtu, path_mtu, physical_network_mtus). Those options define underlying infrastructure though, not tenant MTUs. To support Jumbo frames, TripleO should allow to set those options. That said, it's not the immediate goal of the patch, and hence such an effort would require a separate patch. Mitaka+ documentation on MTU configuration for Neutron: http://docs.openstack.org/mitaka/networking-guide/adv-config-mtu.html Change-Id: I540ba5dc69d0506f71b59746efcce94c73f9317f
2016-07-05Merge "overcloud_volume: cleanup unused Puppet code"Jenkins1-22/+0
2016-07-05Merge "volume: deploy snmp using composable role"Jenkins2-10/+1
2016-07-05Add kernel serviceEmilien Macchi9-38/+24
Add a new service that will load and configure kernel modules. Depends-On: If4f1047ff8c193a14b821d8b826f637872cf62bd Change-Id: I8f771712595d0f4826858b855985f65d3621c3f1
2016-07-05Combine BootstrapNodeDeployment with AllNodesDeploymentSteven Hardy7-43/+38
Currently we have a special controller-only deployment which writes the name/ip of the "bootstrap node", e.g the cluster master, which defaults to the first node in the Controller ResourceGroup. Now we're moving to fully composable services/roles, it's possible folks will want to deploy services that expect to detect the bootstrap node (e.g so only one node does a DB sync) for non-controller roles. So, take this opportunity to combine the bootstrap node deployment with the "all nodes" data, such that we deploy the same data for all roles. Because the boostrap node data is per role cluster, rather than truly global, we pass it via input_values into each per-role Deployment. At some future point we might consider renaming this, e.g to something which describes per-cluster config vs "all nodes", but as a first step let's just rationalize the resources. Change-Id: I4011526a13c51b3d0f95c17fe8ed38115b4fdce4
2016-07-05Merge "Replace NodeConfigIdentifiers with DeployIdentifier"Jenkins12-103/+39
2016-07-05Set os-refresh-config timeout to 4 hoursSteve Baker5-5/+5
This change uses the new os-refresh-config --timeout argument to set a kill timeout for stalled os-refresh-config runs. 4 hours is a reasonable conservative value since it matches the stack timeout - but it can be set shorter in the future based on actual run times. Change-Id: I433f558515df24736263ec0d50de08ad8f78498f Closes-Bug: #1595722 DependsOn: Ibcbb2090aed126abec8dac49efa53ecbdb2b9b2c
2016-07-05Template param for what command occ runsSteve Baker5-0/+35
The ConfigCommand parameter overrides the server resource metadata to specify what command os-collect-config runs whenever any configuration data changes. The default is already 'os-refresh-config' so this change has no effect but it allows a future change to specify an os-refresh-config --timeout argument to fix bug #1595722. Change-Id: I8dd35b6724d8c00e5495faca84ee8fee77641b82 Partial-Bug: #1595722
2016-07-04Remove depends_on: Networks from ControllerServiceChainSteven Hardy1-1/+0
I think this depends_on is bogus - the Controller ResourceGroup does depend on Networks, but not the ControllerServiceChain - this needs to be consistent with the other ServiceChain definitions for the custom-roles work. Change-Id: I0159968719f5d21c8f216ad69af047fa141d54e9
2016-07-04Replace NodeConfigIdentifiers with DeployIdentifierSteven Hardy12-103/+39
We added NodeConfigIdentifiers to trigger config to be re-applied on update, but then later added DeployIdentifier which forces config to *always* be applied on update, so we can simplify things by just referencing the DeployIdentifier directly. Change-Id: I79212def1936740825b714419dcb4952bc586a39