aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-05-26Add isolated net parameters to net-config stacksDan Prince3-0/+66
This patch adds parameters so that we can pass in the ipaddress/subnet for each of the isolated overcloud traffic nets to os-net-config templates. This interface change will allow deployers to plug in a custom version of an os-net-config template that drives isolated network configuration. Change-Id: I35bbe9a0bd81e79f9bfd531fe89c700af8b354c4
2015-05-26Add a ports (ip address) abstraction layerDan Prince6-0/+207
This patch adds a set of templates to create ports on isolated networks via Heat. There are 5 port templates in total which are split out according to the available overcloud networks. Change-Id: I5175ef48c1960ea0d13fc8518328db53921c70cd
2015-05-26Merge "Wire in optional network creation for overcloud"Jenkins3-0/+29
2015-05-22Wire in optional network creation for overcloudDan Prince3-0/+29
This patch enables uses to selectively enable the creation of split out networks for the overcloud traffic. These networks will be created on the undercloud's neutron instance. By default a noop network is used so that no extra networks are created. This allows our default to continue being all traffic on the control plane. Change-Id: Ied49d9458c2d94e9d8e7d760d5b2d971c7c7ed2d
2015-05-22Merge "Firstboot rsync for development purposes"Jenkins1-0/+49
2015-05-22Merge "Add Glance as Pacemaker resource"Jenkins2-5/+30
2015-05-22Merge "Add Cinder services as Pacemaker resources"Jenkins1-7/+51
2015-05-21Align puppet Controller post-deploy Deployment namesSteven Hardy1-11/+11
Align all Deployment resource so we can use a glob convention for stepped deployments via heat hooks/breakpoints. Since most resources already use a FooDeployment_StepN convention, align those which deviate from this as a precursor to supporting stepped deployment, e.g stepping through "*Deployment_Step*". Change-Id: I6bfee04649aa36116d1141ebe06d08b310ec8939
2015-05-21Merge "Overcloud: bump HOT version to 2015-04-30"Jenkins41-41/+41
2015-05-21Add Glance as Pacemaker resourceGiulio Fidente2-5/+30
Change-Id: If87cc4d55e8524246d2cd41a62805f84780006b2
2015-05-21Add Cinder services as Pacemaker resourcesJiri Stransky1-7/+51
Add Pacemaker resources for Cinder services, also add relevant ordering and colocation constraints. Change-Id: Idc2e1b5ec96d882543f7a1a4ec723a010020ab02
2015-05-21Merge "Start non-pacemakerized services in step 4"Jenkins1-4/+1
2015-05-21Merge "Use clustercheck script to control galera-ready"Jenkins4-27/+9
2015-05-21Start non-pacemakerized services in step 4Jiri Stransky1-4/+1
Previously we've been starting non-pacemakerized services in step 3 on bootstrap node and in step 4 on others. Now that $sync_db in OpenStack Puppet modules is decoupled from $enabled and $manage_service [1] we can start the services in step 4 on all nodes. [1] https://bugs.launchpad.net/puppet-glance/+bug/1452278 Change-Id: I6351d972ab00f4661d98338d95310d33f271de2f
2015-05-21Merge "Prepare for adding OpenStack services to Pacemaker"Jenkins1-24/+124
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-20Merge "Move sysctl settings into hieradata"Jenkins8-4/+20
2015-05-20Merge "Set up corosync using hostnames rather than IPs"Jenkins1-1/+1
2015-05-20Move sysctl settings into hieradataGiulio Fidente8-4/+20
This will configure the sysctl settings via puppet instead of sysctl image element. Change-Id: Ieb129d4cbe4b6d4184172631499ecd638073564f
2015-05-20Merge "Clone params for pacemaker rabbitmq resource"Jenkins1-1/+1
2015-05-20Merge "Provide RabbitMQ clients with a list of servers instead of VIP"Jenkins6-30/+18
2015-05-20Use clustercheck script to control galera-readyGiulio Fidente4-27/+9
The exec timeout/attempts is configured so that it is left running for up to 30mins if the command runs but is unsuccessfull and up to 2h if the command times out. Change-Id: I4b6b77e878017bf92d7c59c868d393e74405a355
2015-05-20Prepare for adding OpenStack services to PacemakerJiri Stransky1-24/+124
We need to write config for OpenStack services on all nodes in step 3 so that we can then create pacemaker resources in step 4. (If we wrote config on non-bootstrap nodes in step 4 as it is currently, services on those nodes might be started unconfigured. This is an inter-node ordering issue that cannot be easily solved from within Puppet manifests, hence the use of steps to enforce this ordering.) Change-Id: Ia78ec38520bd1295872ea2690e8d3f8d6b01c46c
2015-05-20Merge "Consolidate use of $pacemaker_master in step 2"Jenkins1-49/+31
2015-05-20Merge "Enable VIPs via Pacemaker from step 2 instead of step 1"Jenkins1-14/+8
2015-05-20Merge "Move NTP and Memacache respectively into step 1 and step 2"Jenkins1-5/+7
2015-05-20Merge "Ensure sync_db is consumed by Keystone and Cinder classes"Jenkins1-2/+6
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-19Clone params for pacemaker rabbitmq resourceJiri Stransky1-1/+1
Set clone params according to [1]. [1] https://github.com/beekhof/osp-ha-deploy/blob/f8a65ab4c34f94737edde7db60337b830bfe6311/pcmk/rabbitmq.scenario Change-Id: I5644de2d6253ab762a1420560ecb5bee2fd83092 Co-Authored-By: Giulio Fidente <gfidente@redhat.com>
2015-05-19Provide RabbitMQ clients with a list of servers instead of VIPGiulio Fidente6-30/+18
This will change the way how RabbitMQ clients get to the servers, they will not go through HAProxy anymore. Change-Id: I522d7520b383a280505e0e7c8fecba9ac02d2c9b
2015-05-19Consolidate use of $pacemaker_master in step 2Giulio Fidente1-49/+31
Aims at having the Pacemaker resources configuration happening in a single if condition. Change-Id: I497538510f80a356e876d476024671b787b77fc9
2015-05-19Enable VIPs via Pacemaker from step 2 instead of step 1Giulio Fidente1-14/+8
Change-Id: I724c341f148fedf725f3b3da778e491741b754ae
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-18Move NTP and Memacache respectively into step 1 and step 2Giulio Fidente1-5/+7
NTP synchronization is moved to to step 1 where initial Pacemaker configuration is performed. Memacached is moved to step 2 to make sure it is up before the OpenStack services are started. Change-Id: I84121a687ee5ddb522239ecefd4d1d76c2f910b5
2015-05-18Ensure sync_db is consumed by Keystone and Cinder classesGiulio Fidente1-2/+6
Change-Id: Ia8cb04b214c71afc884647fb20be3cc1a309c194
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-18Set up corosync using hostnames rather than IPsJiri Stransky1-1/+1
This ensures that the hosts in Corosync and in Pacemaker are the same, to make our cluster setup compatible with the recommended architecture. Change-Id: Id81f315768edd24b8978b8de7093e04904591ce2 Closes-Bug: #1447497 Depends-On: Idb9ad017ffb1048f38fedbd55cc974785f6b1c38
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