aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller.yaml
AgeCommit message (Collapse)AuthorFilesLines
2016-08-08Move setting of Glance's keystone region to API profileJuan Antonio Osorio Robles1-1/+0
This is not necessary in the controller.yaml and is more appropriate in the profile. Change-Id: Ie2badbd87eabb8404acff77e9aa5d091fbdd1499
2016-08-08Move cinder's kestone::auth parameters to API profileJuan Antonio Osorio Robles1-14/+0
In the move to composable services, these parameters are not necessary in the controller, but in the profile itself. They are not yet in use but will be used to populate the keystone endpoint. Change-Id: Ib9b0e474f875a4b2ffbda11c01cb882149997b0c
2016-08-08Move neutron's kestone::auth parameters to server profileJuan Antonio Osorio Robles1-7/+0
In the move to composable services, these parameters are not necessary in the controller, but in the profile itself. They are not yet in use but will be used to populate the keystone endpoint. Change-Id: Ia0866d893c2f3258b0e00efcb8894c7643980173
2016-08-06Add Sahara services to ControllerServices listSteven Hardy1-0/+3
https://review.openstack.org/#/c/318840/ decomposed the Sahara services but they weren't added to the ControllerServices list, thus are now disabled. Since we shipped mitaka with sahara enabled by default, we should probably add them so the behavior is consistent when folks upgrade. This also fixes a couple of issues we missed when landing the initial service templates (partly because CI didn't test them). In order for each service to operate independently when used with Pacemaker, the roles needed to be separated. This commit also does this. Depends-On: Id61eb15b1e2366f5b73c6e7d47941651e40651b1 Change-Id: I0846b328e9d938275e373d58f0b99219b19b326c Closes-Bug: #1592284 Co-Authored-By: Brad P. Crochet <brad@redhat.com>
2016-08-05Add Aodh composable rolesPradeep Kilambi1-41/+4
Implements: blueprint composable-services-within-roles Depends-On: Ie48a123cc5bc402aee635a5daf118b158c6f3b6a Closes-Bug: #1601850 Change-Id: Ifcfe0e3937fa8577635d803d46c3dfc2e873e553
2016-08-05Merge "Move *Image parameters into role templates"Jenkins1-3/+3
2016-08-05Merge "Move per-role *SchedulerHints parameters into role templates"Jenkins1-2/+2
2016-08-02Enable Manila integration - as a composable controller serviceRyan Hefner1-0/+4
Allows the installation and configuration of Manila. Supports the generic driver only. This has a dependency on the puppet-tripleo classes for manila where the puppet specific config now lives. The review at https://review.openstack.org/#/c/315658/ has been merge into this one, as of v68, so manila lands as a composable service. This was brought up on the mailing list at [1] [1] http://lists.openstack.org/pipermail/openstack-dev/2016-May/096126.html Co-Authored-By: Marios Andreou <marios@redhat.com> Implements: blueprint composable-services-within-roles Depends-On: I444916d60a67bf730bf4089323dba1c1429e2e71 Depends-On: I9eda4b3364e5c59342761a1ec71b0eb567c69cf1 Depends-On: I571b65a5402c1028418476a573ebeb9450ed00c9 Change-Id: I7acebac4354fca1f8d7ff6c343c1346bf29b81c6
2016-07-27Move *Image parameters into role templatesSteven Hardy1-3/+3
We've got some inconsistent naming here, but I'm not attempting to fix that yet, only move the current parameters inside each role template. This should be backwards compatible because the parameter names don't change, but also enable progress on custom-roles. We can figure out a strategy for deprecating these and aligning per-role parameter naming in a subsequent patch. Also moves ImageUpdatePolicy, which wasn't consistently passed to all roles anyway, and aligns the default image and constraints for each role. Change-Id: I85ec979934df220acbab9f7c3a6055f23e3bfc29 Partially-Implements: blueprint custom-roles
2016-07-27Move per-role *SchedulerHints parameters into role templatesSteven Hardy1-2/+2
To enable custom roles, move these into the role templates where they can be passed via parameter defaults. Because the Compute role uses an inconsistent NovaCompute naming, these parameters cannot be generated in overcloud.yaml, so moving them enables backwards compatibility to be maintained when we move to a fully jinja generated overcloud (e.g including the role ResourceGroup resources) Change-Id: I3f9b2275f2b1daeb8b83f09548a089dadcfe9eee Partially-Implements: blueprint custom-roles
2016-07-25Merge "Convert Swift ringbuilder to composable services format"Jenkins1-24/+0
2016-07-25Convert Swift ringbuilder to composable services formatSteven Hardy1-24/+0
This moves the ringbuilder puppet code to puppet-tripleo and migrates to the composable services format. Closes-Bug: #1601857 Change-Id: I0ea2230072d3ff61a4047ffff1f4187951370f67 Depends-On: I427f0b5ee93a0870d43419009178e0690ac66bd6
2016-07-25Merge "Move nova::db data within service template"Jenkins1-22/+0
2016-07-22Move nova::db data within service templateGiulio Fidente1-22/+0
Change-Id: I86752248e59a2e98f8ff9b2c5998839f9ade4779
2016-07-22Add 'service_name' to composable servicesDan Prince1-0/+7
This patch adds a new service_name section to each composable service. We now have an explicit unit test check to ensure that service_name exists in tools/yaml-validate.py. This patch also wires service_names into hieradata on each of the roles so that tools can access the deployed services locally during deployment and upgrades. Change-Id: I60861c5aa760534db3e314bba16a13b90ea72f0c
2016-07-12Merge "Gnocchi composable roles"Jenkins1-37/+0
2016-07-12Merge "Use already Deployed/Installed servers"Jenkins1-1/+1
2016-07-12Gnocchi composable rolesPradeep Kilambi1-37/+0
Implements: blueprint composable-services-within-roles Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com> Co-Authored-By: Carlos Camacho <ccamacho@redhat.com> Depends-On: Id728aae79442c45ab48fe0914c065f1807e8890d Closes-Bug: #1601846 Change-Id: I40a3815923099d00a0f3fc1d88a942784e7c6fb9
2016-07-11Composable Horizon service - tripleo-heat-templatesCarlos Camacho1-6/+0
Add horizon as a composable service Depends-on: Iff6508972edfd5f330b239719bc5eb14d3f71944 Change-Id: I734c3e0784c25f30adff2e13faf1155a3e45cefd Partially-implements: blueprint composable-services-within-roles
2016-07-11Merge "Re-enable Ceilometer composable roles for controller"Jenkins1-73/+0
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 "neutron: remove tenant MTU configuration options"Jenkins1-12/+0
2016-07-11Re-enable Ceilometer composable roles for controllerEmilien Macchi1-73/+0
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-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-05neutron: remove tenant MTU configuration optionsIhar Hrachyshka1-12/+0
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-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