aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
AgeCommit message (Collapse)AuthorFilesLines
2015-07-10Allow configuration of MySQL max_connections settingGiulio Fidente3-2/+8
The number of connections created to the database depends on the number of running processes and this is a factor of both the nodes count and the cores count. We make it configurable so it can be increased when needed. Change-Id: I41d511bde95d0942706bf7c28cd913498ea165fb
2015-07-10Merge "Add services to ServiceNetMap to select hostnames resolution network"Jenkins5-8/+11
2015-07-09Adds the NeutronDhcpAgentsPerNetwork parametermarios2-1/+6
Currently for both puppet and image-elements based deploys we set the dhcp_agents_per_network in neutron.conf to 2 and there is no control over that number (in the hieradata for the former and the image element for the latter). This change adds the NeutronDhcpAgentsPerNetwork parameter and also changes the default to 3 when not explicitly set. In the puppet case propagate this parameter in the hieradata for the neutron class and in the non-puppet case expose a new item in the neutron config to be consumed by the neutron image element (that change will point here) Change-Id: Id97c7796db7231b636f2001e28412452cf89562b
2015-07-08Set heat::instance_user to empty stringSteve Baker2-1/+1
In the overcloud heat, heat.conf instance_user is set to heat-admin. The consequence of this is that SSHing into heat created guest VMs will require the user 'heat-admin'. I predict that this will result in user confusion as to how to SSH into their VMs since they will be attempting default usernames (centos, cloud-user etc) or the documented heat default user (ec2-user) This change sets it to an empty string so that default usernames are used. This change depends on the puppet-heat fix to allow empty string instance_user: Depends-On: I9e8be0dd50709d271fc81683770c78380724e405 Change-Id: Id14bf3a4ac1b1c95797dae16c674b32a2da230f8
2015-07-08Merge "Add NeutronExternalNetworkBridge parameter"Jenkins1-0/+6
2015-07-08Add services to ServiceNetMap to select hostnames resolution networkGiulio Fidente5-8/+11
The *HostnameResolveNetwork services define the network against which the hostnames in /etc/hosts should be resolved, defaults to 'internal_api' for all except CephStorage for which it uses 'storage' as they do not have connectivity to 'internal_api'. Closes-Bug: 1471179 Change-Id: Ia8971f8a63016966236e7975ac2d97921a314255
2015-07-08Merge "Wire in Controller pre-deployment extraconfig"Jenkins5-1/+196
2015-07-07Don't set heat_stack_user_role to empty stringBen Nemec1-2/+1
This value doesn't work, and the default of heat_stack_user is fine. See https://github.com/openstack/puppet-heat/blob/989ffa65f4339bfd9612cff3b5ddcc4fd301f695/manifests/engine.pp#L22 Resolves: rhbz#1238844 Change-Id: I247121cb91d2b2a34f0f9f769fb411fcbfe6b571
2015-07-07Merge "Drop swift ceilometer middleware for pacemaker"Jenkins1-1/+0
2015-07-07NFS backend for CinderJiri Stransky5-2/+84
Adds support for NFS backend for Cinder, but remains disabled by default. Change-Id: I9ebef072ed115efe980fa4904ea80f02384522af
2015-07-07Merge "Allow customization of included classes via hieradata"Jenkins11-1/+23
2015-07-06Merge "controller: enable HTTP Glance backend"Jenkins2-8/+12
2015-07-06Add NeutronExternalNetworkBridge parameterDan Prince1-0/+6
This patch adds a new parameter to configure the neutron external network bridge. This setting applies to the bridge used in the Neutron l3_agent.ini file and can by useful if you wish to set external_network_bridge = '' in that file. As part of this fix we also update the environment file for network isolation so that we automatically set the new NeutronExternalNetworkBridge to an empty string. This fixes an issue where overcloud floating IPs did not work correctly when using the external network interface for floating IP traffic. Change-Id: I3bfcda8746780ea0851d88ed6db8557e261cef0d
2015-07-06Configure Heat's ec2 auth uri correctlyBen Nemec1-0/+7
We weren't configuring the Heat ec2 auth uri, so it was using the default pointing at localhost. This won't work in most setups because Keystone listens on specific addresses not including localhost, so configure it to use the proper Keystone address. Change-Id: I979a87c68a8f6f558ccfc04662c158c89fcf1388
2015-07-06Wire in Controller pre-deployment extraconfigSteven Hardy5-1/+196
The recently added cinder-netapp extraconfig contains some additional hieradata which needs to be applied during the initial pre-deployment phase, e.g in controller-puppet.yaml (before the manifests are applied) so wire in a new OS::TripleO::ControllerExtraConfigPre provider resource which allows passing in a nested stack (empty by default) which contains any required "pre deployment" extraconfig, such as applying this hieradata. Some changes were required to the cinder-netapp extraconfig and environment such that now the hieradata is actually applied, and the parameter_defaults specified will be correctly mapped into the StructuredDeployment. Change-Id: I8838a71db9447466cc84283b0b257bdb70353ffd
2015-07-06Merge "Map NovaEnableRbdBackend to ephemeral_storage from nova::compute::rbd"Jenkins2-2/+2
2015-07-06Merge "Add IP to HAProxy kind=Optional constraint"Jenkins1-11/+118
2015-07-06Merge "Remove unwanted constraints between the Redis vip and Ceilometer"Jenkins1-25/+0
2015-07-06Merge "Allow to enable fencing, pass through fencing config"Jenkins3-1/+59
2015-07-06Allow customization of included classes via hieradataGiulio Fidente11-1/+23
Allows inclusion of additional arbitrary puppet classes by the manifests if defined in the *_classes hieradata. Example: to specify the Nova RAM allocation ratio there is a param in nova::scheduler::filter but we do not include it by default; if needed one can use: nova::scheduler::filter::ram_allocation_ratio: 1.8 controller_classes: - nova::scheduler::filter Change-Id: I61d64d2498bed5c49376dee917d106598392db51
2015-07-03Add IP to HAProxy kind=Optional constraintGiulio Fidente1-11/+118
Without the constraint the VIP could get assigned to a node without an active haproxy instance, which ultimately means everything stops working. kind=Optional allows a VIP to relocate to a healthy haproxy instance in the event of a failure without tearing down the entire stack in the process. Change-Id: I44d44952fb42cf91a2a248250a4063e3034d119e
2015-07-02Removes the NeutronScale resource from controller pcmk manifestmarios1-22/+2
As reported in https://bugzilla.redhat.com/show_bug.cgi?id=1238117 and https://bugzilla.redhat.com/show_bug.cgi?id=1236578 the NeutronScale resource is causing problems during post deploy configuration of the overcloud (momentary inconsistency in the host name for the neutron agents, given what NeutronScale does, discussion in BZ 1238117). As discussed in the bugs, we may not need NeutronScale, since our host names should be safe enough for scaling. This change removes neutron scale completely and links startup of neutron-server directly to neutron-ovs-cleanup. If we can safely remove the NeutronScale resource then this change does that. Change-Id: Ib43a2d60b85fd9bb48eff5919602bb74dc463905
2015-07-02Drop swift ceilometer middleware for pacemakerDan Prince1-1/+0
In 88b278f510b0c9351c58dfe67513f3902d415ab6 we dropped the swift ceilometer middleware but we forgot to do it for the overcloud pacemaker manifest. Change-Id: If9fcc5d029492554472edbe3be98a44942f94d20
2015-07-02Map NovaEnableRbdBackend to ephemeral_storage from nova::compute::rbdGiulio Fidente2-2/+2
This maps the template param to the actual class param which optionally configures Ceph as a backend for the ephemeral storage or for the persistent storage only. See I4ae0fd605c5a57aa23bea83b06530a50844d24a0 Change-Id: Ic7007da8317e98d450b1362864e65093a184cb25
2015-07-01Merge "Add special handling of neutron-server service startup to fix race"Jenkins1-0/+10
2015-07-01controller: enable HTTP Glance backendEmilien Macchi2-8/+12
While trying to download a glance image from a webserver, you need to enable the HTTP backend store. This patch aims to merge the configured backend and the HTTP store backend so it will be enabled anytime. Change-Id: Ie769831f8d491c1b7fe08b8fc7df9ebea493f9e8
2015-07-01Allow to enable fencing, pass through fencing configJiri Stransky3-1/+59
Add two new parameters: EnableFencing and FencingConfig. FencingConfig is a json with an expected structure documented in the templates. It gets passed further to puppet-tripleo, which configures the fencing devices. Fencing is configured and enabled in the last step after all pacemaker resources and constraints have been created, which should be a more stable approach than the other way round. Change-Id: Ifd432bfd2443b6d13e7efa006d4120bb0eaa2554 Depends-On: I819fc8c126ec47cd207c59b3dcf92ff699649c5a Depends-On: I8b7adff6f05f864115071c51810b41efad887584
2015-07-01Remove unwanted constraints between the Redis vip and CeilometerGiulio Fidente1-25/+0
We do not want to delay Redis vip start to promotion of Redis master, HAProxy will take care of the validating the backends. We do not need to force colocation of Redis vip with Redis master. We do not want to restart the Ceilometer central agent when the vip moves this can instead cause unwanted cascading restarts due to other constraints in between services. More details can be read on the BZ at: https://bugzilla.redhat.com/show_bug.cgi?id=1236374 Change-Id: I594984cd23db7de57746c3e1018181d61b020f46
2015-06-29Merge "Drop swift ceilometer middleware."Jenkins2-2/+0
2015-06-26Merge "Add missing Pacemaker constraint against Keystone"Jenkins1-9/+18
2015-06-26Merge "Set MariaDB package name in RedHat.yaml"Jenkins3-1/+9
2015-06-26Merge "Enable mysql_clustercheck for Pacemaker scenario"Jenkins1-0/+1
2015-06-26Merge "Increase mongodb_conn_validator timeout to 600"Jenkins1-0/+1
2015-06-25Add missing Pacemaker constraint against KeystoneGiulio Fidente1-9/+18
The Heat contraints group was missing the initial dependency on Keystone, causing Pacemaker to Heat before or in parallel to Keystone. Given Systemd can define dependencies in the unit files, this was additionally causing an unmanaged start of Keystone making cluster initialization to fail (with Keystone start timeout blocking all the depending resources). Also moves Keystone -> Ceilomter constraint on top of Ceilometer constraints group for clarity. Logs and more infos at [1] 1. https://bugzilla.redhat.com/show_bug.cgi?id=1235703 Change-Id: I9505fd46c5bf278afc8ff919c7e768e2de194cb8
2015-06-25Merge "Ensure mysql/mariadb service is not enabled on boot"Jenkins1-0/+1
2015-06-25Merge "Do not set explicitly galera_master to any of the nodes"Jenkins1-4/+1
2015-06-25Enable mysql_clustercheck for Pacemaker scenarioGiulio Fidente1-0/+1
Change-Id: I154c90e6d019807758332e3aefe5dde9d79db6ac Related-Bug: 1456701 Depends-On: I7199c7e5d759a76f58c0f48b40e9d460a3163886
2015-06-25Ensure mysql/mariadb service is not enabled on bootGiulio Fidente1-0/+1
Change-Id: I42462a6de2bf70ef71899833c3f27633f0f59493 Closes-Bug: 1468549 Closes-Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1235454
2015-06-24Set MariaDB package name in RedHat.yamlDan Prince3-1/+9
This moves the hard coded package name for mariadb into the RedHat specific hieradata file. This was recently added to controller.yaml in a1b3fa3e84185b6969a8acfda475fe7fc48bd5a1. Also, resolves an issue where RedHat.yaml wasn't actually getting deployed. This is something that should have happened in 5009cc64322e9fb5723799eb9fbd79076a2dc5da. Change-Id: Iaa30be3c53a7c54d31d47b997966b0106a202ea4
2015-06-24Merge "Make puppet-applying *Post resources depend on hieradata"Jenkins10-0/+51
2015-06-24Increase mongodb_conn_validator timeout to 600Giulio Fidente1-0/+1
This will increase the mongodb_conn_validator timeout from 60 secs (the default) to 600 secs; it should take much less in normal circumstances to start mongod but nodes might not be starting it all at the same time so we use a larger timeframe for the availablity checks. Change-Id: I0ee210be94b33d1c08d67f287aa745743a6649d3
2015-06-24Do not set explicitly galera_master to any of the nodesGiulio Fidente1-4/+1
We will manage nodes membership using the clustercheck script and marking all backends as backup, see change: I7199c7e5d759a76f58c0f48b40e9d460a3163886 Related-Bug: 1467918 Change-Id: I56ebd2d8405ac35c707666d993b396f04aeb683e
2015-06-23Add special handling of neutron-server service startup to fix raceGiulio Fidente1-0/+10
Neutron will populate the database with some data as soon as the neutron-server service is started; we want this to happen from a single node before normal Pacemaker initialization. Change-Id: I422972502fbb10ddae3201464bbd6885749de31e Closes-Bug: 1467904 Closes-Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1233061
2015-06-23Merge "Specify mariadb package name to meet puppetlabs-mysql requirement"Jenkins1-0/+1
2015-06-23Merge "Leave control of Redis balancing in static hieradata"Jenkins1-1/+0
2015-06-23Merge "Add support for isolating block storage nets"Jenkins2-4/+36
2015-06-22Merge "Fix MongoDB connection url configuration in Ceilometer"Jenkins1-6/+7
2015-06-22Fix MongoDB connection url configuration in CeilometerGiulio Fidente1-6/+7
Change-Id: I8a56e7b067044bace5def63ea6170ed817f48acd Closes-Bug: 1467437 Closes-Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1233283
2015-06-22Merge "Enable httpd balancing for Horizon"Jenkins3-3/+8
2015-06-21Add support for isolating block storage netsDan Prince2-4/+36
This patch updates the cinder block storage role for Puppet so that it supports network isolation. This includes using the (optional) isolated networks for MySQL, Glance API, and iscsi network traffic. Change-Id: Icdfbf5fce7380e6049babca0cd50ca2e4008c1b0