aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
AgeCommit message (Collapse)AuthorFilesLines
2016-08-16Remove deprecated net_ip_uri_map outputGiulio Fidente5-10/+40
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 Fidente5-10/+40
Change-Id: I83ca923140d7f8ca3101e851e88ca3107a99555a
2016-08-15Merge "Remove deprecated hdp plugin and add ambari"Jenkins1-1/+1
2016-08-15Move neutron settings out of puppet/compute.yamlDan Prince1-51/+0
This finishes moving most of the config settings out of compute.yaml for Neutron and Rabbit. Also removes some other misc unused parameters. Change-Id: Ie340c33fb3434eb70e131ff6e252d0909aabd37c Related-Bug: #1604412
2016-08-15Mv Ceilometer settings out of puppet/compute.yamlDan Prince2-25/+6
This finishes moving most of the config settings out of compute.yaml for Ceilometer. Change-Id: I96369ebba28f0af4eb2d6d520b478213d8021822 Related-Bug: #1604412
2016-08-15Move Nova settings out of puppet/compute.yamlDan Prince5-107/+62
This finishes moving most of the config settings out of compute.yaml for Nova and into the proper nova-* services. Only the bind port/VIP related Nova settings remain now and those will be dealt with in a follow up patch. Change-Id: I1c40e7d54c11dfff2aaa6438c7701e98da17ebe6 Related-Bug: #1604412
2016-08-15Merge "Convert ServiceNetMap to a nested template"Jenkins1-2/+2
2016-08-15Merge "Remove NeutronEnableTunnelling from templates"Jenkins1-4/+0
2016-08-13Merge "Remove KeystoneRegion from controller.yaml"Jenkins1-5/+0
2016-08-12Remove NeutronEnableTunnelling from templatesBob Fournier1-4/+0
As described in https://bugs.launchpad.net/tripleo/+bug/1532830, the OVS agent no longer uses enable_tunneling, which is controlled by NeutronEnableTunnelling, so this change removes NeutronEnableTunnelling from the Heat templates. This change depends on NeutronEnableTunnelling also being removed from python-tripleoclient and puppet-neutron no longer using the enable_tunneling hieradata. Change-Id: I1ff6902ebd15041fc57ffff20a07455f171a004b Closes-Bug: 1532830 Depends-On: I28d33592374f60cb5222a866efaf9d137aca1c5a Depends-On: I73630653330c67444827f32740c44e9d25b5db31
2016-08-12Rename NeutronServer to NeutronApi to align with ServiceNetMapSteven Hardy1-1/+1
The new composable service name conflicts with the existing ServiceNetMap naming, so align with NeutronApi since ServiceNetMap exists in current released versions. This is required so we can correctly generate the neutron_api_node_ips list (needed by puppet-tripleo) based on the service_name. Change-Id: Ic1d45cbaa77bc6ac9ca247c880a9845ca49905da Partially-Implements: blueprint custom-roles
2016-08-12Remove deprecated node_ips hiera keysSteven Hardy1-32/+0
This aligns with the new naming conventions in puppet-tripleo, so the keys can be more easily generated from the service_names. Change-Id: Idb4a740e70257e3c69d8ec7d0c88594cc091b6a7 Partially-Implements: blueprint custom-roles Depends-On: I423b544df174254ac511b906b0c570e701678022
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 "Add parameter for enabling purging configuration files"Jenkins2-0/+14
2016-08-12Merge "Align node_ips hiera keys with the service name."Jenkins1-1/+33
2016-08-12Merge "Move gnocchi's kestone::auth parameters to API profile"Jenkins3-12/+15
2016-08-12Merge "Convert EndpointMap to not require per-service VIP parameters"Jenkins12-15/+15
2016-08-11Set coordination url for gnocchi storagePradeep Kilambi1-0/+12
Change-Id: I8107b84eaea8baf3ed664c70d4cf16537d869bcb
2016-08-11Update Ironic composable servicesDmitry Tantsur4-6/+57
* Add service for configuring Nova compute with Ironic * Fix authentication in Ironic APU * Provide a separate environment file for enabling Ironic Change-Id: I211e6d91eacd238b04a1aa37528d5a91523407d9 Partially-Implements: blueprint ironic-integration
2016-08-11Reinstate CloudDomain properties for Controller/Compute rolesSteven Hardy5-5/+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-11Convert EndpointMap to not require per-service VIP parametersSteven Hardy12-15/+15
Currently we have a hard-coded set of per-service parameters, which will cause problems for custom roles and full composability. As a first step towards making this more configurable, remove the hard-coded per-service parameters from overcloud.yaml, and adjust the EndpointMap generation to instead accept two mappings, the ServiceNetMap and a mapping of networks to IPs (effectively this just moves the map lookup inside the endpoint map instead of inside overcloud.yaml) Change-Id: Ib522e89c36eed2115a6586dd5a6770907d9b33db Partially-Implements: blueprint custom-roles
2016-08-11Merge "Add hieradata for Manila v1 and v2 endpoints"Jenkins1-3/+6
2016-08-11Align node_ips hiera keys with the service name.Steven Hardy1-1/+33
To enable composable generation of this switch the key names to align with the service_name of each service. Note that this should depend on I423b544df174254ac511b906b0c570e701678022 and previously passed CI with that defined, but because we now run gate validation jobs on puppet-tripleo it's impossible to land, so this now contains both old and new hiera keys temporarily, which will be removed when the puppet-tripleo patch lands. Change-Id: I7febf28bf409e25e8e5961ab551b6d56bb11e0c6 Partially-Implements: blueprint custom-roles
2016-08-11Merge "Add support for cinder v3 endpoint"Jenkins1-0/+3
2016-08-11Add hieradata for Manila v1 and v2 endpointsJuan Antonio Osorio Robles1-3/+6
manila::keystone::auth assumes that two endpoints will be created; one for each version of Manila. This is not consistent with what we provide to the manifest. So we then add the needed endpoint to the EndpointMap. v2 is left as the default (not needing to specify a version when getting the value from the endpoint map), and v1 was added as an extra suffix. Change-Id: Ie8754fbb21f50c2613a2c05a52d771f4d1aeb4bb
2016-08-10Add support for cinder v3 endpointJuan Antonio Osorio Robles1-0/+3
This adds the needed parts for the keystone endpoint of cinder v3 API. Change-Id: Ic56446095e72b9e469a7b0e9ea5159fa31847381
2016-08-10Add cinder-backup service as roleErno Kuvaja3-1/+97
Tempest tests for cinder contain backup tests that fail unless cinder-backup service is started. This patch facilitates the service start upon the overcloud deployment. Original patch converted to composable role. Co-Authored-By: Giulio Fidente <gfidente@redhat.com> Depends-On: Ib1dfe52b83ab01819fc669312967950e75d8ddf1 Change-Id: I9ca97b3f1c26aac6d81b3525377e1f5fb962313f
2016-08-10Add parameter for enabling purging configuration filesBrent Eagles2-0/+14
This patch adds a parameter, EnableConfigPurge, to the base nova and neutron service files. The value is passed to their respective puppet modules to control whether resources not managed by puppet are purged from the config files. The default value is set to true. Change-Id: I32732dc2ed7a7b3187e8727592cb4add0c6b9cf6 Closes-Bug: #1611800
2016-08-09Allow map_replace substitution of network namesSteven Hardy5-10/+25
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 Robles3-12/+15
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 outdated Neutron auth options"Jenkins1-3/+1
2016-08-09Merge "Remove static hieradata"Jenkins17-43/+8
2016-08-09Merge "Move neutron-related options for nova to base profile"Jenkins2-7/+7
2016-08-09Merge "Move nova's kestone::auth parameters to API profile"Jenkins3-9/+14
2016-08-09Merge "Move setting of Glance's keystone region to API profile"Jenkins2-1/+5
2016-08-09Merge "Configure project name for keystone::auth resource in heat"Jenkins3-1/+2
2016-08-09Merge "Move cinder's kestone::auth parameters to API profile"Jenkins3-15/+13
2016-08-09Merge "Move neutron's kestone::auth parameters to server profile"Jenkins3-8/+10
2016-08-09Move neutron-related options for nova to base profileJuan Antonio Osorio Robles2-7/+7
Change-Id: I21c09b2b0bad7736f3c84c55bf14ef7986c2d108
2016-08-09Move nova's kestone::auth parameters to API profileJuan Antonio Osorio Robles3-9/+14
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"Jenkins5-9/+14
2016-08-08Remove deprecated hdp plugin and add ambariSagi Shnaidman1-1/+1
HDP plugin was deprecated in newton and not supported in sahara replace it with supported ambari plugin Change-Id: I6998e3e1e1fe9a81c7941aec90c876ee133a601d Closes-bug: 1611107
2016-08-08Merge "Support arbitrary attributes for the Ceph pools"Jenkins2-8/+30
2016-08-08Remove static hieradataEmilien Macchi17-43/+8
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-08Support arbitrary attributes for the Ceph poolsGiulio Fidente2-8/+30
This change adds a CephPools parameter which can be used to provide custom settings for any Ceph pool. It also removes our custom setting for the default pg_num, pgp_num and size so that these are used for the managed pools (and can be overridden) but aren't enforced globally. Change-Id: Idcf28bec46beabb1b590fc8e78b43e58d8e35717 Closes-Bug: 1517969 Depends-On: I38978f0f3119e4ab7dd45021e598253cb066cb5a
2016-08-08Merge "Set Coordination url for central agent"Jenkins1-5/+1
2016-08-08Move setting of Glance's keystone region to API profileJuan Antonio Osorio Robles2-1/+5
This is not necessary in the controller.yaml and is more appropriate in the profile. Change-Id: Ie2badbd87eabb8404acff77e9aa5d091fbdd1499
2016-08-08Configure project name for keystone::auth resource in heatJuan Antonio Osorio Robles3-1/+2
Heat API and CFN API both need to have teh keystone::auth*::tenant parameters configured. Change-Id: Ibdc3d693f5a63362add3fc71064fc01bb4593403
2016-08-08Move cinder's kestone::auth parameters to API profileJuan Antonio Osorio Robles3-15/+13
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