aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller.yaml
AgeCommit message (Collapse)AuthorFilesLines
2016-08-17Add tripleo-packages composable serviceDan Prince1-6/+0
This creates a new service to help manage the puppet-tripleo class that enables and disables package installation features. NOTE: we can't move the upgrade setting into the new composable service yet due to coupling with the UpgradeDeployment resources. Change-Id: If35cf6a6f023e12ae8ebbc2d9929d244eb3ffa3a
2016-08-16Remove unneeded net_ip_map dump into hieradataGiulio Fidente1-4/+0
We will lookup bind addresses using map_replace within the templates so dumping net_ip_map as hieradata is unneeded. Change-Id: If54c9033fc58d2cfaa040e30adeed7f58e44fd88
2016-08-16Remove deprecated net_ip_uri_map outputGiulio Fidente1-4/+24
Takes the net_ip_uri_map value from the *_uri values emitted by net_ip_map instead. Also removes TenantIp and TenantIpUri from net_vip_map_external templates as there won't be any VIP on the tenant network. Change-Id: Icdac3d58162891f5ca3d5c20f14fcdff1781996f
2016-08-16Remove deprecated net_ip_subnet_map outputGiulio Fidente1-4/+24
Change-Id: I83ca923140d7f8ca3101e851e88ca3107a99555a
2016-08-15Merge "Convert ServiceNetMap to a nested template"Jenkins1-2/+2
2016-08-13Merge "Remove KeystoneRegion from controller.yaml"Jenkins1-5/+0
2016-08-12Convert ServiceNetMap to a nested templateSteven Hardy1-2/+2
We introduce a new ServiceNetMap resource which enables some more flexible mappings between the services and their networks. Specifically this patch means: 1. ServiceNetMap no longer has to specify the entire list of all services, operators may if they wish, but a subset is now valid where you want to accept the defaults for some services (the defaults are now accessible via the ServiceNetMapDefaults parameter. 2. We can map some keys which don't fit a pattern that enables conversion from CamelCase to snake_case which is required for compatibility with the service_names in puppet/services* This should be backwards compatible, and in future when we remove internal dependency on the CamelCase names, we could also enable operators to specify e.g heat_api_network in ServiceNetMap which would be more consistent. Change-Id: Ib60198adf76bb69ffbafbfac739e356d153f6194 Partially-Implements: blueprint custom-roles
2016-08-12Merge "Move gnocchi's kestone::auth parameters to API profile"Jenkins1-7/+0
2016-08-11Reinstate CloudDomain properties for Controller/Compute rolesSteven Hardy1-1/+0
These were removed in https://review.openstack.org/#/c/347050 but it turns out the defaults in the role templates is bad, as an empty string results in a malformed hosts file fqdn. So, partially revert that patch so we always pass the global CloudDomain from overcloud.yaml, accepting the default configured there, and remove the empty-string defaults in the role templates. Change-Id: I0ea4190a23488986a3ee9e887328e0e7a03fe3aa
2016-08-09Allow map_replace substitution of network namesSteven Hardy1-2/+5
To allow per-node data such as bind_ip's to move into the composable services templates, we do a value substitution on the config settings hiera map, where e.g internal_api will be replaced with the NetIpMap IP assigned to that. To enable subnet/uri lookup via the same method, we add all the subnet/uri mappings to the main net_ip_map output. Change-Id: I7850d4dc8bf4db5f7ac6a6b53c1d900b561b4580
2016-08-09Remove KeystoneRegion from controller.yamlJuan Antonio Osorio Robles1-5/+0
this is no longer needed here as it's not used anymore. Change-Id: I8aa9cc5f991fccc8c9acc81fb96e71b7e3fc145e
2016-08-09Move gnocchi's kestone::auth parameters to API 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: Iab3ab05e16872d94d3b3ab4827e2f87f4970aee3
2016-08-09Merge "Remove static hieradata"Jenkins1-5/+0
2016-08-09Merge "Move neutron-related options for nova to base profile"Jenkins1-7/+0
2016-08-09Merge "Move nova's kestone::auth parameters to API profile"Jenkins1-8/+0
2016-08-09Merge "Move setting of Glance's keystone region to API profile"Jenkins1-1/+0
2016-08-09Merge "Move cinder's kestone::auth parameters to API profile"Jenkins1-14/+0
2016-08-09Merge "Move neutron's kestone::auth parameters to server profile"Jenkins1-7/+0
2016-08-09Move neutron-related options for nova to base profileJuan Antonio Osorio Robles1-7/+0
Change-Id: I21c09b2b0bad7736f3c84c55bf14ef7986c2d108
2016-08-09Move nova's kestone::auth parameters to API profileJuan Antonio Osorio Robles1-8/+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: I42e30243b631c10d9454da444afdb50e551bbb2c
2016-08-09Merge "Move *Flavor parameters into per-role templates"Jenkins1-2/+3
2016-08-08Remove static hieradataEmilien Macchi1-5/+0
Static hieradata moved to composable services, we don't need the files anymore. It also cleanup how we construct Hieradata configuration by removing unused hiera files. Change-Id: I19f85b6c1b734473cf908ddaca29ad966f9f5405
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 *Flavor parameters into per-role templatesSteven Hardy1-2/+3
We have some inconsistent naming here, but move them with their current names for backwards compatibility, we can address the deprecation of the inconsistent names at a future time. This is required to enable jinja templating of roles in overcloud.yaml Change-Id: I2ea673d9bc52967f9b7c25555059b964abf66966 Partially-Implements: blueprint custom-roles
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