summaryrefslogtreecommitdiffstats
path: root/puppet/controller.yaml
AgeCommit message (Collapse)AuthorFilesLines
2016-07-11Use already Deployed/Installed serversJames Slagle1-1/+1
This patch provides a set of templates that enables tripleo-heat-templates to be used with a set of already deployed, installed, and running servers. In this method, Nova and Ironic are not used to deploy any servers. This approach is attractive for POC deployments where dedicated provisioning networks are not available, or other server install methods are dictated for various reasons. There are also assumptions that currently have to be made about the software installed on the already deployed servers. Effectively, they must match the standard TripleO overcloud-full image. Co-Authored-By: Steve Hardy <shardy@redhat.com> Change-Id: I4ab1531f69c73457653f1cca3fe30cc32a04c129
2016-07-11Merge "Set os-refresh-config timeout to 4 hours"Jenkins1-1/+1
2016-07-11Merge "Template param for what command occ runs"Jenkins1-0/+7
2016-07-05Set os-refresh-config timeout to 4 hoursSteve Baker1-1/+1
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 Baker1-0/+7
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-04Replace NodeConfigIdentifiers with DeployIdentifierSteven Hardy1-10/+0
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
2016-07-04Switch Ceph Monitor/OSD/Client/External to composable rolesGiulio Fidente1-6/+0
Change-Id: I1921115cb6218c7554348636c404245c79937673 Depends-On: I7ac096feb9f5655003becd79d2eea355a047c90b Depends-On: I871ef420700e6d0ee5c1e444e019d58b3a9a45a6
2016-06-30Composable Timezone service - ControllerCarlos Camacho1-6/+0
Add timezone as a composable service Change-Id: I99f0b0727a10ee74ea1de0499c8bc3ba37ab3345 Partially-implements: blueprint composable-services-within-roles
2016-06-30Merge "Basic support for deploying Ironic in overcloud"Jenkins1-0/+1
2016-06-30Merge "Convert SNMP configuration to composable services format"Jenkins1-10/+0
2016-06-29Drop unused VIP params to controller.yamlDan Prince1-36/+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 Hardy1-10/+0
Change-Id: I7265b0781acefd4a0de687b0465144e57bcc079f Partially-Implements: blueprint composable-services-within-roles
2016-06-29Merge "Fix ceilometer auth url"Jenkins1-1/+2
2016-06-29Basic support for deploying Ironic in overcloudImre Farkas1-0/+1
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-29Convert swift storage to composable servicesSteven Hardy1-12/+0
Depends-On: Ie68d7eccf4938bdbdea93327af0638b3fd002b3e Change-Id: I1eb68d0cd5f8bf4bf954dd9f12941bc493345708 Partially-Implements: blueprint composable-services-within-roles
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-23Revert "Ceilometer composable roles for controller"Dan Prince1-0/+66
This reverts commit c48410a05ec0ffd11c717bcf350badc9e5f0e910. We've discovered this patch never had passing CI due to a DLRN build failure. Change-Id: I546cb3e340d20701662affda7e28b586c58ba6de
2016-06-23Merge "Ceilometer composable roles for controller"Jenkins1-66/+0
2016-06-23Merge "Drop extraconfig for neutron-opencontrail.yaml"Jenkins1-1/+0
2016-06-23Merge "Drop extraconfig for neutron-nuage.yaml"Jenkins1-1/+0
2016-06-23Ceilometer composable roles for controllerPradeep Kilambi1-66/+0
Depends-On: I4b5e93a108e80e91af26ffee454130ee18c0042e Change-Id: I59c948ead475f449cb8d1b752f39b7eaaf056130
2016-06-21Merge "Composable roles within services - NTP"Jenkins1-6/+0
2016-06-21Merge "Change Aodh to use own backend"Jenkins1-0/+10
2016-06-21Composable roles within services - NTPCarlos Camacho1-6/+0
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-21Merge "set aodh auth_url explicitly"Jenkins1-0/+1
2016-06-20Change Aodh to use own backendPradeep Kilambi1-0/+10
Currently aodh uses ceilometer backend, instead change it to use its own mysql db. Change-Id: Idaa879af4e6946e804111d581402e620beb89885
2016-06-16Drop extraconfig for neutron-opencontrail.yamlDan Prince1-1/+0
This patch drops the extraconfig interface in favor of using the composable services nested stack instead. The benefit is that it is easier to enable multiple services (like network and storage backends at the same time) and all of the opencontrail settings get to live in the same file. Partially-implements: blueprint composable-services-within-roles Change-Id: I0edbd86a8c981bd6e8a547cd2a6ebed18ecdbb31
2016-06-16Drop extraconfig for neutron-nuage.yamlDan Prince1-1/+0
This patch drops the extraconfig interface in favor of using the composable services nested stack instead. The benefit is that it is easier to enable multiple services (like network and storage backends at the same time) and all of the nuage settings get to live in the same file. Partially-implements: blueprint composable-services-within-roles Change-Id: I15fe14e9d6881bc408eb6bb10d9293bd914ef858
2016-06-15Merge "Drop extraconfig for neutron-plumgrid.yaml"Jenkins1-1/+0
2016-06-14Enable nova-api as a composable serviceEmilien Macchi1-7/+0
Implement NovaApi service using nova-base for common parameters. Change-Id: Ibcb89b332ab73f18d05e5b2e454964e322b982e6 Implements: blueprint composable-services-within-roles Depends-On: I1dde63a5a7d1624494a7157a9679f88f4cb780e0
2016-06-14Merge "Move Neutron core and service plugin to base"Jenkins1-20/+0
2016-06-13Drop extraconfig for neutron-plumgrid.yamlDan Prince1-1/+0
This patch drops the extraconfig interface in favor of using the composable services nested stack instead. The benefit is that it is easier to enable multiple services (like network and storage backends at the same time) and all of the plumgrid settings get to live in the same file. Partially-implements: blueprint composable-services-within-roles Change-Id: I1c5827e3650a29f7a0258531f84ae0f50f22343d
2016-06-13Move Neutron core and service plugin to baseDan Prince1-20/+0
Move the settings/parameters for the neutron core plugin and neutron service plugins into the base role. Partially-implements: blueprint composable-services-within-roles Change-Id: Ieb307fa7bc5ecfbc500787e3f292488476f7d850
2016-06-12Composable roles within services - MongoDBCarlos Camacho1-12/+2
Add MongoDB as a composable service. Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com> Change-Id: Idaa3275def3bcdb302a66fc1c88531ff718bcf67 Depends-On: Idb1e78ebec7682fe68ca5902a22cfb6030498091
2016-06-09Remove unused Neutron parameters from rolesDan Prince1-44/+0
This patch removes a variety of unused Neutron parameters. Most of these parameters stem from the old days of tripleo-image-elements and are either no longer used with or were never completely implemented to begin with. Partially-implements: blueprint composable-services-within-roles Change-Id: I478d282640affa89e38004e465458e79bd2d153b
2016-06-09composable neutron ml2 and ovs agentDan Prince1-146/+0
Adds new puppet and puppet pacemaker specific services for the Neutron ml2 configuration and the Ovs agent. Partially-implements: blueprint composable-services-within-roles Change-Id: I896e5dfe6fae49371c9fe7f47c4364eb6f621b07
2016-06-09composable neutron serverDan Prince1-41/+0
Adds new puppet and puppet pacemaker specific services for the Neutron server configuration. Depends-On: I52815f45a04bf3e39940b9cb116261730580a3e2 Partially-implements: blueprint composable-services-within-roles Change-Id: I1680d4b7044f16d672e99ca356d954b6734af287
2016-06-08set aodh auth_url explicitlyPradeep Kilambi1-0/+1
Aodh puppet module defaults the auth_url to localhost this could cause issues when handling gnocchi* alarms. Fix to set the explicitly in the templates. Closes-bug: #1590589 Change-Id: Ib93a3381f3f24efea6a1cf713171cc1a259ee7d0
2016-06-06Enable nova-conductor as a composable serviceEmilien Macchi1-5/+0
Implement NovaConductor service using nova-base for common parameters. * Move rabbitmq parameters from controller.yaml to nova-base service, as an example. More parameters will move in the future. * Move nova-conductor bits from monolithic manifests to the new service using new profiles from puppet-tripleo. Depends-On: Iaaf3a3c2528d9747e41f360a1fe55f95ed37b2d1 Implements: blueprint composable-services-within-roles Change-Id: I178f092b74ae12f2cb6f006db7cb00e4d6bddfd8
2016-06-04Merge "Composable roles within services - Redis"Jenkins1-5/+3
2016-06-02Switch Cinder Api/Scheduler/Volume to composable rolesGiulio Fidente1-95/+1
Uses a shared cinder-base resource to do the database and messaging configuration for all three services. Depends-On: I3c6d5226eed5f0f852b0ad9476c7cd9a959fda69 Change-Id: I47c5fd190efca5f02e73fd22aba6cda573daf5cc
2016-06-02Composable roles within services - RedisPradeep Kilambi1-5/+3
Co-Authored-By: Carlos Camacho <ccamacho@redhat.com> Change-Id: I0d9332f7f4f9116c5435d338a9c35d4fb3f512c6 Implements: blueprint composable-services-within-roles Depends-On: I60493a3aa64e5136b763e8e2084d728f5f812f8a
2016-06-02Merge "Composable Sahara services"Jenkins1-45/+0
2016-06-01Composable Sahara servicesBrad P. Crochet1-45/+0
Adds new puppet and puppet pacemaker specific services for Sahara API and Sahara Engine. The Pacemaker templates extend the default Sahara services and swap in the pacemaker specific puppet-tripleo profile instead. Change-Id: I1adda514e9592d149a3d45743a9a00b59c28ca38 Depends-On: I0c8bd68f9a98626e9d67ef713c72c9dd05b7cc12 Implements: blueprint composable-services-within-roles
2016-05-31Merge "Cleanup hieradata to reduce Puppet warnings"Jenkins1-7/+6
2016-05-31Cleanup hieradata to reduce Puppet warningsEmilien Macchi1-7/+6
Some puppet parameters were deprecated, some of them removed. This patch reduce the number of warnings to a few, and the rest of warnings are bugs that are in progress by Puppet OpenStack team. This patch is mostly some cleanup so we don't have useless warnings in Puppet catalog. Changes: * Update Ceilometer auth params * Update Neutron auth params * Update Heat auth params * Update Swift hash suffix param * Remove neutron::server::notifications::nova_url, useless. Change-Id: Ie32681a1fe32735f70ba372630da09f91227298c
2016-05-31Merge "loadbalancer: update hiera parameters for HAproxy/keepalived split"Jenkins1-7/+9
2016-05-31Convert Swift proxy to composable services formatSteven Hardy1-29/+1
Switch the swift proxy service to use the new composable services format. Change-Id: Idc9ac64818882e73836ac99bbad56eec184c9a5d Partially-Implements: blueprint composable-services-within-roles Depends-On: I6bd72284911f3f449157a6fc00b76682dd53bd8c
2016-05-30loadbalancer: update hiera parameters for HAproxy/keepalived splitEmilien Macchi1-7/+9
In puppet-tripleo, we split loadbalancer.pp in 2 classes to be more composable: haproxy & keepalived. This patch is just updating all hiera parameters related to HAproxy & keepalived. Depends-On: I46ed8348dc990d9aa0d896e1abea3b30a8292634 Change-Id: Ibf56184cd10af1d0dcae773c02b0f31a6204badf
2016-05-30Pass MysqlVirtualIP via EndpointMapGiulio Fidente1-17/+21
By passing the MysqlVirtualIP via the EndpointMap we won't need it to be provided as a parameter to the services. This follows what is already happening for the glance registry service with I9186e56cd4746a60e65dc5ac12e6595ac56505f0. Change-Id: Iad2ab389bf64d0fc8b06eb0e7d29b5370ff27dff Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com>