summaryrefslogtreecommitdiffstats
path: root/puppet
AgeCommit message (Collapse)AuthorFilesLines
2016-07-29Merge "We don't need to set a default for the CephX keys and cluster FSID"Jenkins3-6/+0
2016-07-29Merge "Convert service_name to underscore syntax"Jenkins94-94/+94
2016-07-29Merge "Move nova constraints from controller manifest to each service"Jenkins1-82/+0
2016-07-28We don't need to set a default for the CephX keys and cluster FSIDGiulio Fidente3-6/+0
Change-Id: I28021f27a5adc8433df8abdadf0b571b20674fa6 Partial-Bug: 1607407
2016-07-28Convert service_name to underscore syntaxSteven Hardy94-94/+94
Currently we use hyphens, e.g cinder-api, but in overcloud.yaml we have a lot of references to services (e.g for AllNodesConfig) by underscore, e.g cinder_api. To enable dynamic generation of this data, we need the service name in underscore format. Change-Id: Ief13dfe5d8d7691dfe2534ad5c39d7eacbcb6f70
2016-07-28Merge "Create role for the fake openstack-core resource"Jenkins1-0/+20
2016-07-27Move nova constraints from controller manifest to each serviceMichele Baldessari1-82/+0
Currently we are still creating all the pacemaker constraints for nova in the main overcloud_controller_pacemaker.pp manifest file. Let's move those to each role where they belong. Note that given that a constraint depends on two separate pacemaker resources it is a bit arbitrary in which file they end up being (the one of the first resource or the second one). Depends-On: I96a3a313d15fac820b020feae0568437c2cbade3 Change-Id: I4f15485b1f355b3b38fc6c16552f204aa8bba7bc
2016-07-27Create role for the fake openstack-core resourceGiulio Fidente1-0/+20
Change-Id: Iacd94294b8a66bc082bb2b3e8d3364ec1bf053b8 Depends-On: I16a786ce167c57848551c7245f4344c382c55b3d
2016-07-27Migrate Puppet Hieradata to composable servicesEmilien Macchi42-302/+242
Migrate puppet/hieradata/*.yaml parameters to puppet/services/*.yaml except for some services that are not composable yet. Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com> Change-Id: I7e5f8b18ee9aa63a1dffc6facaf88315b07d5fd7
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"Jenkins2-34/+13
2016-07-25Merge "Composable firewall rules"Jenkins28-124/+159
2016-07-25Merge "Convert Swift ringbuilder to composable services format"Jenkins8-151/+41
2016-07-25Merge "Explicitly set nova and neutron host on controllers"Jenkins3-4/+3
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 Fidente2-34/+13
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 Hardy8-151/+41
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 Prince121-0/+151
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"Jenkins2-5/+28
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 Macchi2-5/+28
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-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-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-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-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-18Remove useless mongodb variables in ha manifestEmilien Macchi1-16/+0
Remove useless parameters that move to puppet-tripleo some time ago. Change-Id: I54e99f2012f0dd12eb9e1cbad5bc73827019934a
2016-07-18Don't collect gnocchi-service tag in THTEmilien Macchi1-2/+1
The gnocchi-service tag is already collected in puppet-tripleo Pacemaker Gnocchi profile and was not removed here. Change-Id: Ic38aeae849d16db36663f16156d1c9fbcf86784a
2016-07-18overcloud_compute.pp: remove nova_config paramsEmilien Macchi1-6/+0
Remove usage of nova_config for 2 parameters. The parameters were here for legacy and should not be useful anymore. Change-Id: Ifd4e89ff43ab7ebc5c69dec526696eb9902aa621
2016-07-14Move MySQL Galera within composable servicesEmilien Macchi4-187/+40
This patch just moves the Puppet code into puppet-tripleo. A future iteration will be to move parameters within the service template. Closes-Bug: #1601853 Depends-On: I7ddae28a6affd55c5bffc15d72226a18c708850e Change-Id: I51a05dbf53f516b200c146b35529ce563ce9ac7b