summaryrefslogtreecommitdiffstats
path: root/puppet/controller.yaml
AgeCommit message (Collapse)AuthorFilesLines
2016-08-26Move Redis, Memcached, Sahara, OVS agent out of role templatesGiulio Fidente1-10/+0
Change-Id: I99784b5cfbb741bfc6d1ce9b77e8acf6cf00e073 Related-Bug: 1604414
2016-08-25Mv ceilo, aodh, and gnocchi out of controller.yamlDan Prince1-32/+0
This patch moves the remaining hiera settings for Ceilometer, Aodh, and Gnocchi out of controller.yaml and into the respective composable services. Change-Id: I01377aa5c121ecbb4a96b4f0525924c7bbf12198 Related-bug: #1604414
2016-08-25Mv keystone, mongo, manila out of controller.yamlDan Prince1-16/+0
This patch moves keystone, mongodb, and manila bind host settings out of controller.yaml and into composable services. Change-Id: I1874dc47fffa30606107999da702442badde35c9
2016-08-25Move Swift hiera settings into composable servicesDan Prince1-14/+0
This moves the swift local bind and hash prefix settings into the relevant swift-* composable services. Change-Id: I807ff14c4cc9afa39efee13849e0f8c22718f1c0
2016-08-25Merge "Move glance/heat hiera settings to services"Jenkins1-18/+0
2016-08-25Merge "Adding optional aci-opflex hiera data"Jenkins1-0/+1
2016-08-25Merge "Move out of roles any Ceph setting"Jenkins1-24/+0
2016-08-25Move glance/heat hiera settings to servicesDan Prince1-18/+0
This patch removes the remaining bind IP, and password settings for Heat and Glance into the composable services. Change-Id: I17abcb2a08a1972cbcf8163f6608ac22ddfc15f7 Related-bug: #1604414
2016-08-25Merge "Update authtoken parameters to match recent changes"Jenkins1-3/+0
2016-08-24Update authtoken parameters to match recent changesEmilien Macchi1-3/+0
Update authtoken parameters for: - Aodh - Ironic - Manila - Nova - Ceilometer Change-Id: Ie123b8da1a7af2e406aadca4775de9e8c4e6e1f5
2016-08-24Merge "Permit usage of raw disks as backends for Swift storage"Jenkins1-1/+12
2016-08-24Move Keepalived/HAproxy settings out of controllerDan Prince1-36/+0
This moves the config settings out of controller.yaml for Keepalived and HAproxy. NOTE: the tripleo::haproxy::redis_password wasn't getting set correctly before this patch. Looks like a breakages that occurred when puppet-tripleo dropped the loadbalancer class. Related-Bug: #1604414 Change-Id: Id24b02ac73f4ae33b20194da8a5f99f17403ece9
2016-08-24Move out of roles any Ceph settingGiulio Fidente1-24/+0
Change-Id: I6ff0f977a1fb2fd55b29becd296ab01c65b50228
2016-08-23Move RabbitMQ settings out of controller.yamlDan Prince1-31/+0
This moves the config settings out of controller.yaml for RabbitMQ and into puppet/services/rabbitmq.yaml. Related-Bug: #1604414 Change-Id: I6b3d71653fb91b89b85dae7df4088afff22b71ac
2016-08-23Move MySQL settings out of puppet/controller.yamlDan Prince1-60/+0
This moves the config settings out of controller.yaml for MySQL and into puppet/services/database/mysql.yaml. The top leve MysqlRootPassword is still maintained by default in overcloud.yaml so that users who upgrade won't get broken. New users may optionally specify the MysqlRootPassword as a parameter instead which will take priority over the top level generated parameter. We drop the top level MysqlClusterUniquePart because it is no longer used (I think it was a remnant from t-i-e). Related-Bug: #1604414 Change-Id: I06ebac0f4c87dabfccefb2e550a64650868c5b26
2016-08-23Permit usage of raw disks as backends for Swift storageGiulio Fidente1-1/+12
Adds a SwiftRawDisks parameter which can be used to provide a map disk-keyed with properties for each additional disk to be used as backend for Swift storage. Change-Id: I65ff488c8eb62c03fc45f04e70e18a5f4022d6b6 Depends-On: Id450e777930bb0b749c0ecfab0679a52a84fd7fe Depends-On: Iac75cf2244339fae444be5859b7583e80bafc4e2
2016-08-22Set cinder::api::bind_host within service templateGiulio Fidente1-17/+0
The map_replace at [1] will replace the network name with the local node IP address on the given network. 1. I7850d4dc8bf4db5f7ac6a6b53c1d900b561b4580 Change-Id: Ica064b5ffac61cebe2aae06d4f1d1d9e84258c10
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-04Adding optional aci-opflex hiera dataRatnakar Kolli1-0/+1
This change adds an optional cisco_aci hiera data file during ControllerExtraConfigPre and ComputeExtraConfigPre Change-Id: I158276f80c107e611817f6bc3b557dbf6dce19ee Implements: blueprint aci-opflex
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