summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-07-27Move *Image parameters into role templatesSteven Hardy6-45/+19
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-27Remove KeyName parameter from overcloud templateSteven Hardy1-10/+0
This is already defined in all the per-role templates and is passed via parameter_defaults: Change-Id: Ifde54d3d29a3f0754f0f05740d6b6030aa871d38 Partially-Implements: blueprint custom-roles
2016-07-27Move per-role *SchedulerHints parameters into role templatesSteven Hardy6-35/+10
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-27Remove some properties from overcloud.yaml Controller groupSteven Hardy1-127/+1
Remove those parameters which simply shadow parameters defined in puppet/controller.yaml, these can be passed via parameter_defaults, which is the default. The remaining properties are more tricky so will be handled via subsequent patches. Partially-Implements: blueprint custom-roles Change-Id: I9bbbd12631de8cb1ad83e265f6ddc9e942dff9ab
2016-07-27Filter null/None service namesSteven Hardy1-2/+7
To enable use of the service_names lists in overcloud.yaml we need to strip any null/None values or list processing becomes cumbersome. These happen because we're currently disabling some services via OS::Heat::None in the resource_registry, it may be possible to remove when we've got a fully composable approach to generating the *Services lists. Change-Id: I8ef53b4279d93850c207c73aab0d75095a2497a2 Partially-Implements: blueprint custom-roles
2016-07-26Force a tty for sudo in get-occ-config.shJames Slagle1-1/+1
This script will sometimes fail with "you must have a tty to run sudo" depending on how it was executed. Add -tt to the $SSH_OPTIONS to always force a tty. Change-Id: Ic1144b9ba90d4af35db826a78e637da965569841 Closes-Bug: #1606544
2016-07-26Merge "Set MDS/OSD firewall ports from ceph-osd template"Jenkins2-3/+7
2016-07-26Merge "Cleanup templates from the shared CephCluster config"Jenkins4-62/+16
2016-07-25Merge "Composable firewall rules"Jenkins28-124/+159
2016-07-25Merge "Convert Swift ringbuilder to composable services format"Jenkins10-169/+44
2016-07-25Merge "Explicitly set nova and neutron host on controllers"Jenkins3-4/+3
2016-07-25Merge "Remove tenant_id from nova v2.1 endpoint"Jenkins2-6/+6
2016-07-25Set MDS/OSD firewall ports from ceph-osd templateGiulio Fidente2-3/+7
Change-Id: Ie8d1678e6e32271ff31ea9dd7fcf7ef9e8956b86
2016-07-25Composable firewall rulesDan Prince28-124/+159
Split out the firewall rules in puppet/hieradata/controller.yaml into the composable services Depends-On: Id370362ab57347b75b1ab25afda877885b047263 Change-Id: Icaecab100d3f278035fbbb3facb9bf6c62c76c03
2016-07-25Cleanup templates from the shared CephCluster configGiulio Fidente4-62/+16
Removes from the templates the old CephCluster configuration and deployment which before roles was distributing the shared settings for the Ceph cluster configuration. Change-Id: Ia704f5d7add85e52dd477f4bc758aa0a02e4b39b
2016-07-25Convert Swift ringbuilder to composable services formatSteven Hardy10-169/+44
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"Jenkins10-37/+55
2016-07-23Merge "Fixes type and description for NeutronL3HA"Jenkins2-3/+8
2016-07-22Merge "Remove unused redis_vip parameter"Jenkins1-2/+1
2016-07-22Merge "Move mysql::host param from MysqlInternal to MysqlNoBracketsInternal"Jenkins7-7/+7
2016-07-22Move nova::db data within service templateGiulio Fidente10-37/+55
Change-Id: I86752248e59a2e98f8ff9b2c5998839f9ade4779
2016-07-22Add 'service_name' to composable servicesDan Prince123-3/+185
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-21Merge "Deploy Horizon with composable apache service"Jenkins3-5/+29
2016-07-21Fixes type and description for NeutronL3HATim Rozet2-3/+8
puppet-neutron takes this variable as boolean. Although it doesn't change the behavior in master (because the variable is used directly as config), in mitaka it is used as a conditional and should be properly fixed. Also a fix is needed in python-tripleoclient because it is hard coded to be True there based on number of controllers being greater than 1. Therefore we shoudl remove that logic from tripleoclient and implement it in THT. In order to do that the pacemaker version of the variable is defaulted to true. Partial-Bug: 1605379 Change-Id: I0b797dbe188382e2dc32506913aaa60a0a21bd68 Signed-off-by: Tim Rozet <trozet@redhat.com>
2016-07-21Explicitly set nova and neutron host on controllersBen Nemec3-4/+3
In I7d07c57b7276815c72d08acaa86f673e43eb0498 we set this for compute nodes, but we also need it for controllers. Otherwise when a controller reboots it may come back up with a different host value, which seems to break networking for anything that was created before the reboot. In my case, it changes from the short hostname (without domain name) to the fqdn. Since we set it to fqdn for the compute nodes, let's do the same for controllers. This moves all of the host setting to the base yaml of the nova and neutron profiles. Change-Id: Ieb793b9e9fd2dfc98584691412f9991aa99e0b47 Closes-Bug: 1604907
2016-07-21Move mysql::host param from MysqlInternal to MysqlNoBracketsInternalGiulio Fidente7-7/+7
The ::host parameter expects IPv6 addresses withouth brackets; this change aligns the remaining services to use MysqlNoBracketsInternal as it happens already for the others (eg. Keystone). Change-Id: Ia72d325447408b1cb5fea836034bbcd75d17ddf1
2016-07-21Merge "Remove ::nova::cron::archive_deleted_rows"Jenkins4-16/+3
2016-07-21Deploy Horizon with composable apache serviceEmilien Macchi3-5/+29
Deploy Horizon with composable apache service and don't include: ::tripleo::profile::pacemaker::apache Because it's already included in the profiles in puppet-tripleo. Change-Id: I5382d5cc95ba10805019142a9a223dbd4a4b8074 Depends-On: Id28c618133e53e28dfac7e3e9cf9f5f5a6b2421a
2016-07-21Merge "Include new apache pacemaker profile"Jenkins1-8/+4
2016-07-21Merge "Remove the ControllerCount contraint"Jenkins1-2/+0
2016-07-21Remove unused redis_vip parameterGiulio Fidente1-2/+1
Depends-On: I6ba962c682dc2ab8c6ee5238e0c176d9ae05d696 Change-Id: I796524128c49fe1927e96288d40b257a4d862ee7
2016-07-21Merge "Fix KeystoneWorkers default value"Jenkins1-1/+1
2016-07-20Merge "Fix ceilometer auth url for compute"Jenkins1-1/+1
2016-07-20Include new apache pacemaker profileEmilien Macchi1-8/+4
In https://review.openstack.org/345013 we are working to create a new profile for Apache with Pacemaker. We can't include this class in the profiles (keystone, etc) yet because it would cause a duplicate resource error in Puppet catalog. So we need to first clean the code in overcloud_controller_pacemaker.pp and include the new class, and then we can either create a new composable service in THT for apache or include the class directly in puppet-tripleo profiles that need it (keystone, horizon, etc). Change-Id: I1222fbf099b4268e33ec8ee32380f0a6b1d5e1af Depends-On: I9ae6cee2bfb0f8974d41d700454cfde2df06c2d1
2016-07-20Fix KeystoneWorkers default valueJiri Stransky1-1/+1
The current default doesn't get expanded to its real value correctly, the new one should work better, it's according to hiera docs: https://docs.puppet.com/hiera/3.2/variables.html Change-Id: I8d1df131d2f1eee4ae0f725358d33a3ecfa3175a
2016-07-20Fix ceilometer auth url for computePradeep Kilambi1-1/+1
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: If672b78b8ce9addf831f5b72a702447e1422f30e
2016-07-20Remove the ControllerCount contraintSteven Hardy1-2/+0
Some deployments want to deploy zero controllers, and this will become a more likely configuration when support for custom roles lands (e.g a set of decomposed custom roles vs the monolithic controller role may be deployed instead). Change-Id: Idb21779f3ad9d875576bdb5e6502ed27a72600ba
2016-07-19Remove ::nova::cron::archive_deleted_rowsEmilien Macchi4-16/+3
::nova::cron::archive_deleted_rows is not called in puppet-tripleo Nova API profile. Change-Id: Idc343e481ca04b404be5311b2908f016e4517aad Depends-On: I7035f7998c11dc5508dae8c1a750b93c2944b2d4
2016-07-19Fix gnocchi::storage::ceph::ceph_keyringMarius Cornea1-3/+3
This change configures gnocchi::storage::ceph::ceph_keyring to a valid ceph keyring location. Change-Id: I29fb0cb8a865353a43246a09d1c08eb0cf872cea Closes-Bug: 1604508
2016-07-19Merge "Repurpose KeystoneWorkers add keystone::wsgi::apache::threads"Jenkins1-7/+7
2016-07-19Merge "gnocchi: configure db_sync command in the profile"Jenkins2-2/+1
2016-07-19Merge "Add MysqlNoBracketsInternal to enable-tls.yaml"Jenkins1-0/+1
2016-07-18Merge "Remove enable_load_balancer on nonha manifest"Jenkins1-2/+0
2016-07-18Merge "Don't collect gnocchi-service tag in THT"Jenkins1-2/+1
2016-07-18Merge "Remove useless mongodb variables in ha manifest"Jenkins1-16/+0
2016-07-18Merge "overcloud_compute.pp: remove nova_config params"Jenkins1-6/+0
2016-07-18gnocchi: configure db_sync command in the profileEmilien Macchi2-2/+1
Configure db_sync extra command in the profile itself Change-Id: Ia27068907a2149da2cb87b50ffe65b27a0542ed7
2016-07-18Remove enable_load_balancer on nonha manifestEmilien Macchi1-2/+0
The parameter is not used anywhere. Change-Id: I31bd2b0524038b3a3b45f1c5b95fb02ef6cfa903
2016-07-18Merge "Missing CephClientKey parameter in puppet-ceph-devel and ↵Jenkins2-0/+3
storage-environment"
2016-07-18Remove useless mongodb variables in ha manifestEmilien Macchi1-16/+0
Remove useless parameters that move to puppet-tripleo some time ago. Change-Id: I54e99f2012f0dd12eb9e1cbad5bc73827019934a