aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-05-20Overcloud: bump HOT version to 2015-04-30Dan Prince41-41/+41
This patch bumps the HOT version for the overcloud to Kilo 2015-04-30. We should have already done this since we are making use of OS::stack_id (a kilo feature) in some of the nested stacks. Also, this will give us access to the new repeat function as well. Change-Id: Ic534e5aeb03bd53296dc4d98c2ac5971464d7fe4
2015-05-19Merge "Remove unused enable_pacemaker setting from templates"Jenkins1-2/+0
2015-05-19Merge "Configure HAProxy, Galera and MongoDB before start"Jenkins1-61/+66
2015-05-19Merge "Update to reflect puppet-pacemaker changes"Jenkins1-14/+28
2015-05-19Merge "Fix RabbitMQ startup race"Jenkins1-16/+22
2015-05-19Merge "Environment which configures puppet pacemaker."Jenkins1-0/+4
2015-05-19Merge "Add a directory for overcloud heat environments"Jenkins2-0/+29
2015-05-18Remove unused enable_pacemaker setting from templatesGiulio Fidente1-2/+0
Use of Pacemaker is governed by the resource registry since change Ibefb80d0d8f98404133e4c31cf078d729b64dac3 Change-Id: I2f1fa8d6d28ae009940be2c2c530066197aa543b
2015-05-18Configure HAProxy, Galera and MongoDB before startJiri Stransky1-61/+66
As with RabbitMQ previously, we can hit the same race conditions between config being written on all nodes vs. pacemaker starting the services. Configuring the services at least one step earlier than starting them will allow us to get rid of this race condition. Change-Id: I78f47dfb82ca8609ed40f784d65ba92db3d411f3
2015-05-18Update to reflect puppet-pacemaker changesJiri Stransky1-14/+28
Recently puppet-pacemaker has changed in a backward incompatible way, we need to reflect the changes in TripleO. This patch also addresses non-deterministic order between corosync service and VIP creation. Depends-On: Ia68fee38f99dba18badc07eb0adbc473cfcffdf3 Change-Id: Ia7fe14cfb1401be98b62afeed589bb9f1b8af761 Co-Authored-By: Yanis Guenane <yanis.guenane@enovance.com>
2015-05-18Fix RabbitMQ startup raceGiulio Fidente1-16/+22
The Pacemaker resource agent might have attempted to start the service when the rabbitmq-env.conf file wasn't written yet, making it attempt to bind on 0.0.0.0 Co-Authored-By: Jason Guiditta <jguiditt@redhat.com> Co-Authored-By: Jiri Stransky <jistr@redhat.com> Change-Id: I081a0bfc6fc3943b8ade71799357022d29317d79
2015-05-15Environment which configures puppet pacemaker.Dan Prince1-0/+4
Change-Id: I314955708ff99a557da5a6d223b1f56bd51855d9
2015-05-15Add a directory for overcloud heat environmentsDan Prince2-0/+29
This patch adds a new directory called environments which contains custom Heat environment files that can be used to enable custom overcloud features. As an initial example a puppet-ceph-devel.yaml environment has been added which can be used to spin up a small Ceph cluster for dev/testing. This directory may be useful for collecting other feature related Heat environment settings in the future as well. Things like isolated network settings, etc. Change-Id: Ia6998ae05d2363384d2a616a31d5795c8b2d85d5
2015-05-15Merge "Ensure haproxy is not enabled by puppet-tripleo when EnablePacemaker"Jenkins1-0/+1
2015-05-15Merge "Makes sure galera can handle the connections"Jenkins2-2/+6
2015-05-15Makes sure galera can handle the connectionsmarios2-2/+6
Increases the max_connections since this is currently set to 151. This causes problems in a baremetal environment with multiple CPUs. A related change is @ https://review.openstack.org/#/c/183046/2 for haproxy. There is also a bug report at https://bugzilla.redhat.com/show_bug.cgi?id=1218322 Change-Id: I9b4690191616cc04c4edc7b2402bd9ec54a7d17d
2015-05-14Merge "Use pacemaker::resource::service instead of ::systemd"Jenkins1-3/+3
2015-05-14Ensure haproxy is not enabled by puppet-tripleo when EnablePacemakerGiulio Fidente1-0/+1
Change-Id: Icfe70de72eb2cf09fe2d00d9ae49baebc79e1886
2015-05-13Merge "Create split out neutron networks via Heat."Jenkins7-0/+309
2015-05-13Merge "Add Galera as a Pacemaker resource when EnablePacemaker"Jenkins7-72/+207
2015-05-13Add Galera as a Pacemaker resource when EnablePacemakerYanis Guenane7-72/+207
This commit aims to support the creation of the galera cluster via Pacemaker. With this commit in, three use-cases will be supported. * Non HA setup / Non Pacemaker setup : The deployment will take place as it is currently the case in f20puppet-nonha. Nothing changes. * Non HA setup / Pacemaker setup : Even though it is a non ha setup, galera cluster via pacemaker will be deployed with a cluster nbr of 1. * HA setup / Non Pacemaker setup : N/A * HA setup / Pacemaker setup : It is assumed that HA setup will always be with pacemaker. So in this situation pacemaker will deploy a cluster of 3 galera master nodes. Depends-On: I7aed9acec11486e0f4f67e4d522727476c767d83 Change-Id: If0c37a86fa8b5aa6d452129bccf7341a3a3ba667
2015-05-11Use optimized config for RabbitMQ clusterGiulio Fidente3-6/+21
Use some optimized configuration settings for RabbitMQ when clustered. Data is ported from Astapor. Change-Id: If54aff5654dbe75e68197588be12cb3995c77ec7
2015-05-11Use pacemaker::resource::service instead of ::systemdGiulio Fidente1-3/+3
The puppet-pacemaker module realizes some abstraction for the different service types in ::service already. Change-Id: Icd897e18fda01b1bf4722a975c991e26341ac129 Closes-Bug: 1449988
2015-05-11Puppet: Split out controller pacemaker manifestDan Prince6-116/+553
This patch adds support for using the Heat resource registry so that end users can enable pacemaker. Using this approach allows us to isolate all of the pacemaker logic for the controller in a single template rather than use conditionals for every service that must support it. Change-Id: Ibefb80d0d8f98404133e4c31cf078d729b64dac3
2015-05-06Create split out neutron networks via Heat.Dan Prince7-0/+309
This patch adds a new abstraction for network creation within Heat. This (optional) set of templates may be disabled if you wish to create Neutron networks for the undercloud via Heat templates... instead of using os-cloud-config JSON to do so. Creating networks with Heat has the benefit of being parameter driven so that users can quickly enable networks using the resource registry and parameters. There are 5 networks to start with which are roughly modeled around networks an Overcloud user might want to use to isolate their traffic. The intent is to make these opt-in and configurable for end users. The networks.yaml template can be used to create all of the networks using parameters in the resource registry. Change-Id: I5f2b3356378eb263d90d428cc83c7f5b141957e1
2015-05-05Merge "Add MongoDB as a Pacemaker resource when EnablePacemaker"Jenkins1-1/+32
2015-05-05Merge "puppet: install Horizon on overcloud-controller"Jenkins6-0/+33
2015-05-05Merge "Move Ceph OSD data path configuration into static ceph.yaml file"Jenkins2-1/+1
2015-05-05Add MongoDB as a Pacemaker resource when EnablePacemakerYanis Guenane1-1/+32
This commit allows one to configure MongoDB as a pacemaker resource when EnablePacemaker is set to true Change-Id: Iedfba3eb851442d0ca3b8c0a7163a63285ab6071
2015-05-04Merge "Add support for Glance RBD backend"Jenkins7-6/+39
2015-05-04Add support for Glance RBD backendDan Prince7-6/+39
This patch adds support for a new GlanceBackend setting which can be set to one of swift, rbd, or file to control which Glance backend is configured for use by default. Change-Id: Id6a3fbc3477e85e8e2446e3dc13d424f9535d0ff
2015-05-01Revert "Keystone domain for Heat"Dan Prince4-21/+4
This reverts commit 7313930c22b9f18d67e630de084ffcc6fad5ebe7. Seeing errors when trying to create the keystone admin role with packages. (ImportError: No module named os_client_config) Change-Id: I78796598ccb8d2ffd6bfca85dce7d18dc0fd768e Related-bug: #1450786
2015-04-30Merge "Keystone domain for Heat"Jenkins4-4/+21
2015-04-30Merge "Allow deployer to choose Ceilometer backend"Jenkins4-12/+55
2015-04-29Merge "Disable dhcp_domain in Nova for the overcloud as well"Jenkins1-0/+1
2015-04-29Merge "Remove hardcoded references to .novalocal in hostnames"Jenkins12-27/+10
2015-04-29Merge "Add hooks for extra post-deployment config"Jenkins13-1/+121
2015-04-29Merge "Add RabbitMQ as a Pacemaker resource when EnablePacemaker"Jenkins2-30/+48
2015-04-29Allow deployer to choose Ceilometer backendYanis Guenane4-12/+55
Ceilometer can use different backends. A recent change moved backend support for Ceilometer from MySQL to MongoDB. This commit introduce a greater flexibility, letting the deployer choose wheter MySQL or MongoDB should be used as a backend for Ceilometer. Change-Id: I0d5bfb0763cbcee234df7ab13574d866743d5ddf
2015-04-28Merge "Configures haproxy as a Pacemaker resource"Jenkins1-0/+3
2015-04-28Merge "Switch VIP management from Keepalived to Pacemaker"Jenkins1-0/+11
2015-04-28Add RabbitMQ as a Pacemaker resource when EnablePacemakerGiulio Fidente2-30/+48
Change-Id: I43a74c1db324144d33e96a94cb718db30e0fd243
2015-04-28Disable dhcp_domain in Nova for the overcloud as wellGiulio Fidente1-0/+1
The overcloud networking is managed by Neutron so we do not want Nova to append its default domain part to hostnames. Change-Id: Ic1edda158bf0579ed34455ad27db8ca444d26b85
2015-04-28Remove hardcoded references to .novalocal in hostnamesGiulio Fidente12-27/+10
Remove references to the .novalocal domain part in the hosts file. Change-Id: Idf14907adaf2f35440b6f28870fe18434eadd1be Depends-On: Iadfdf4120c4d1c9b6976321753957fd4eecf301c
2015-04-27Merge "Make all default values match overcloud defaults"Jenkins6-13/+13
2015-04-27Configures haproxy as a Pacemaker resourceGiulio Fidente1-0/+3
Change-Id: I6bf5ada5a5298f4079594f3cc8b01ac0ef85876e
2015-04-27Switch VIP management from Keepalived to PacemakerGiulio Fidente1-0/+11
Change-Id: I45511569fda6b00ca35b1e590537a29271e56ce0 Depends-On: I98b9b3dbc48009ce255d964ac580e1a31f279f1e
2015-04-27puppet: install Horizon on overcloud-controllerEmilien Macchi6-0/+33
Install OpenStack Dashboad (Horizon) on the Overcloud Controller with Puppet. Co-Authored-By: Giulio Fidente <gfidente@redhat.com> Depends-On: If9b12d373e407be8be8428d77145f131eb450e88 Change-Id: I254e895014f58a51dade3dcdc63eabbb5dc458ac
2015-04-24Separate the network configuration per flavor.Dan Sneddon12-6/+70
This change allows a different network config for each family of hosts. For instance, the controller may have a different network configuration than a block storage node. This change adds a declaration for each family in the overcloud-resource-registry.yaml & overcloud-resource-registry-puppet.yaml. Change-Id: I083df7ebbb535f97d8ddec2ac0e06281c55986cd
2015-04-24Move Ceph OSD data path configuration into static ceph.yaml fileGiulio Fidente2-1/+1
Change-Id: I577dc98cdf3648c9eb77bd084ae18273a52b22f9