aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-08-11Reinstate CloudDomain properties for Controller/Compute rolesSteven Hardy6-5/+2
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-11Merge "Add hieradata for Manila v1 and v2 endpoints"Jenkins3-3/+126
2016-08-11Merge "Add support for cinder v3 endpoint"Jenkins3-1/+124
2016-08-11Add hieradata for Manila v1 and v2 endpointsJuan Antonio Osorio Robles3-4/+127
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-11Merge "Remove Compute role parameters from overcloud.yaml"Jenkins1-96/+0
2016-08-10Merge "Allow map_replace substitution of network names"Jenkins6-10/+46
2016-08-10Add support for cinder v3 endpointJuan Antonio Osorio Robles3-1/+124
This adds the needed parts for the keystone endpoint of cinder v3 API. Change-Id: Ic56446095e72b9e469a7b0e9ea5159fa31847381
2016-08-10Merge "Retain existing ComputeHostnameFormat when upgrading older envs"Jenkins1-0/+2
2016-08-09Allow map_replace substitution of network namesSteven Hardy6-10/+46
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-09Merge "Disable mistral services by default."Jenkins2-0/+7
2016-08-09Remove Compute role parameters from overcloud.yamlSteven Hardy1-96/+0
To enable custom-roles we need to pass these directly into th role template (where these are already defined with the same names). The remaining parameters which will be removed in subsequent patches, as some will require additional work to ensure backwards compatibility. Change-Id: I5a7e4f12aa7b9697086c1e19a4f7fcb24198c1d4 Partially-Implements: blueprint custom-roles
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"Jenkins6-44/+14
2016-08-08Merge "Support arbitrary attributes for the Ceph pools"Jenkins2-8/+30
2016-08-08Merge "Make deployed-server OS::Neutron::Port optional"Jenkins4-10/+31
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
2016-08-08Move neutron's kestone::auth parameters to server profileJuan Antonio Osorio Robles3-8/+10
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-08Merge "Update cinder-api with new authtoken parameters"Jenkins1-4/+4
2016-08-08Remove outdated Neutron auth optionsSergey Kolekonov1-3/+1
Currently Keystone auth plugins should be used to perform authorization. admin_* parameters as well as identity_uri are deprecated and not needed Change-Id: I3018932a106df562e94067e037b3bc862be97b51
2016-08-08Merge "Convert AllNodesConfig hosts config to a map"Jenkins2-29/+18
2016-08-08Merge "Add EnabledServices output to overcloud.yaml"Jenkins1-0/+8
2016-08-07Make deployed-server OS::Neutron::Port optionalDan Prince4-10/+31
This patch makes it possible to set OS::TripleO::DeployedServer::ControlPlanePort: OS::Heat::None in your resource_registry and thereby avoid the creation of a neutron port for the deployed server. This is useful if you are bootstrapping things in an environment without Neutron. Also, includes a new deployed-server-noop-ctlplane.yaml environment file. Change-Id: I2990dc816698e0f6e3193a8fc7c9c6767c6e50e5
2016-08-06Add Sahara services to ControllerServices listSteven Hardy8-37/+44
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-06Disable mistral services by default.Carlos Camacho2-0/+7
Optional services should be disabled by default in the overcloud nodes. This submission makes mistral disabled by default and allows to enable it base on an environment file. Depends-On: I942d419be951651e305d01460f394870c30a9878 Change-Id: I0dd245b75142834f71f3bd591b43c3f69d63217b
2016-08-05Merge "Remove keystone PKI related parameters"Jenkins1-16/+0
2016-08-05Update cinder-api with new authtoken parametersEmilien Macchi1-4/+4
Puppet OpenStack modules are moving to a new class to configure Keystone authtoken parameters, so we can more easily enable Keystone v3 from a single interface. It's consistent across all modules and does support both Keystone v2 and v3 parameters. This patch updates Cinder now, but more will follow when we'll add support to all modules. Change-Id: I5aa3f2b03672c14c0dbeac222f421ab94221ecf7
2016-08-05Add Aodh composable rolesPradeep Kilambi17-212/+224
Implements: blueprint composable-services-within-roles Depends-On: Ie48a123cc5bc402aee635a5daf118b158c6f3b6a Closes-Bug: #1601850 Change-Id: Ifcfe0e3937fa8577635d803d46c3dfc2e873e553
2016-08-05Merge "Add environment file to enable DVR"Jenkins7-0/+86
2016-08-05Remove keystone PKI related parametersSteven Hardy1-16/+0
These interfaces have all been deprecated by keystone, and we don't offer any parameter interface to select PKI token format anyway, so remove these to align with keystone reccomendations. The keystone.conf.sample says these values may be silently ignored or removed, so it seems reasonable to do the same here (parameter_defaults should be ignored from old stacks). Change-Id: Ic88d584863a98ed49fc335825fbfba7a52b0f14e Depends-On: I8232262b928c91dcde7bea2f23fa2a7c2660719e
2016-08-05Merge "Move *Image parameters into role templates"Jenkins6-45/+19
2016-08-05Merge "Remove KeyName parameter from overcloud template"Jenkins1-10/+0
2016-08-05Merge "Move per-role *SchedulerHints parameters into role templates"Jenkins6-35/+10
2016-08-04Merge "Next generation HA architecture work"Jenkins11-37/+19
2016-08-04Merge "Remove some properties from overcloud.yaml Controller group"Jenkins1-127/+1
2016-08-04Set Coordination url for central agentPradeep Kilambi1-5/+1
Use the redis_vip value from hiera. Change-Id: I3b354012c8c054633497a6d80ff325f55e7b7142
2016-08-04Add environment file to enable DVRBrent Eagles7-0/+86
This patch adds support for conditionally enabling DVR by deploying the L3 and metadata agents on the compute node and setting the proper configuration values throughout. Implements: blueprint neutron-dvr-support Change-Id: I24099795e76ecd520c990ba49d3511288dec7a12