aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-07-15Enable hieradata ExtraConfig overrides for ControllerSteven Hardy2-70/+12
Wires in the ControllerExtraConfig and ExtraConfig parameters so that they may be used to specify overrides of the default hieradata. Note if this is used to override values specified via parameters rather than hard-coded values in puppet/hieradata caution should be used as the overridden values will always take precendence regardless of the parameter input, unless the parameter is provided directly to the Deployment resource applying the manifiest (e.g not the pattern currently employed in most of t-h-t) Also note that ControllerExtraConfig takes precedence over the deployment-wide ExtraConfig. For example, here's how you would pass a value which disables the heat-api-cfn service on all controllers. This would be put into an environment file, then passed to the heat stack-create via an extra -e option: parameters: controllerExtraConfig: heat::api_cfn::enabled: false Note the parameter capitalization is different in the top-level overcloud-without-mergepy template for some reason. Change-Id: I6d6e3e78460308134d95c01892bb242aba70e9ca
2015-07-15Merge "Adds the NeutronTunnelIdRanges and NeutronVniRanges parameters"Jenkins6-5/+133
2015-07-15Merge "Configure Heat's ec2 auth uri correctly"Jenkins1-0/+7
2015-07-15Merge "Allow a user to disable MongoDB journaling"Jenkins5-0/+24
2015-07-15Merge "Removes the NeutronScale resource from controller pcmk manifest"Jenkins1-22/+2
2015-07-14Merge "neutron-server: Remove start/sleep/stop pattern"Jenkins1-6/+1
2015-07-13neutron-server: Remove start/sleep/stop patternYanis Guenane1-6/+1
Currently the bootstrap of the neutron server happens with the use of a start/sleep/stop pattern. Since Pacemaker doesn't mind if the service is already started let simply start the neutron server on the $pacemaker_master node and wait for 5 sec. Change-Id: I894dc3305f7d6685ebcc6828e690c718a63f32bd Closes-Bug: #1473410
2015-07-13Merge "Output internal API VIPs"Jenkins1-0/+27
2015-07-13Adds the NeutronTunnelIdRanges and NeutronVniRanges parametersmarios6-5/+133
This adds the NeutronTunnelIdRanges and NeutronVniRanges parameters which govern the GRE or VXLAN tunnel IDs (respectively) that are to be made available for overcloud tenant networks. These both default to "1:1000," to retain the current behaviour. They are propagated to the hiera data for puppet deploys and there is a separate change to support passing these into the config via the neutron tripleo-image-element at https://review.openstack.org/#/c/199592/ Change-Id: I967a8cae218a31e888abc438e9de5756ae627adb Related-Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1240631
2015-07-13Allow a user to disable MongoDB journalingYanis Guenane5-0/+24
By default MongoDB enables a journaling system that prevents loss of data in case of an unexpected shut-down. When journaling is enabled, MongoDB will create the journal files before actually starting the daemon[1]. The journaling feature is useful in production environment, but not really on a CI-like system, where we only want to make sure MongoDB is setup correctly and running, hence here we allow a user to enable/disable MongoDB journaling. [1] http://docs.mongodb.org/manual/core/journaling/ Change-Id: I0e4e65af9f650c10fdf5155ff709b4eb984cf4e1 Closes-bug: #1468246
2015-07-10Allow configuration of MySQL max_connections settingGiulio Fidente5-2/+17
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"Jenkins6-8/+16
2015-07-09Adds the NeutronDhcpAgentsPerNetwork parametermarios4-1/+17
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-09Merge "Add RemovalPolicies param for resource groups"Jenkins1-0/+38
2015-07-08Merge "Add NeutronExternalNetworkBridge parameter"Jenkins5-0/+27
2015-07-08Add services to ServiceNetMap to select hostnames resolution networkGiulio Fidente6-8/+16
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-08Add RemovalPolicies param for resource groupsJan Provaznik1-0/+38
This allows to specify particular nodes when scaling down number of nodes in a resource group. Change-Id: Idc3682ed430f351d533b990b44e8038866434e42
2015-07-08Merge "Wire in Controller pre-deployment extraconfig"Jenkins10-72/+230
2015-07-08Output internal API VIPsJiri Stransky1-0/+27
Seeding of overcloud keystone endpoints is currently done via a script that is external to the overcloud heat stack. Previously the script didn't have a way to figure out what are the IP addresses that it should use for internal service endpoints. This patch adds those IP addresses into the stack outputs so that the script can properly configure internal endpoints. Change-Id: I9ae4fc4413a79d6b7e2dce1571fd7083c23348ca
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-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 Prince5-0/+27
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-06Merge "Add ControlPlaneNetwork to vip.yaml"Jenkins1-0/+4
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 Hardy10-72/+230
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"Jenkins5-1/+133
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 a default route to the external isolated network"Jenkins2-4/+20
2015-07-01Merge "Remove bridge from nic1 in network bond templates"Jenkins5-51/+1
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 Stransky5-1/+133
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-07-01Merge "Include Redis VIP in example environment"Jenkins1-0/+3
2015-06-29Add a default route to the external isolated networkDan Sneddon2-4/+20
This change adds a parameter for ExternalInterfaceDefaultRoute and uses that parameter to set the default route on the controller nodes. This allows Horizon and the public APIs to be reachable from routed networks outside the overcloud. Co-Authored-By: Dan Prince <dprince@redhat.com> Change-Id: I67a72767342237049f53f5085a6faf891fbf0c30
2015-06-29Merge "Drop swift ceilometer middleware."Jenkins2-2/+0
2015-06-27Remove bridge from nic1 in network bond templatesDan Sneddon5-51/+1
The bridge that is built on the bonds in the bond-with-vlans example has an extraneous bridge on the storage and compute templates, and an incorrect bridge on the controller template. There is no reason to do anything on nic1, which is assumed to be the provisioning interface, because it will be configured by DHCP. Also, on the controller template we actually want br-ex to contain the VLAN with the external network, rather than be configured on the provisioning interface. Change-Id: Ibe2343d5281f7b63a7b63b17d96d8442d0b96105
2015-06-27Add ControlPlaneNetwork to vip.yamlDan Sneddon1-0/+4
There are two files in network/ports which control the VIP behavior called ctlplane_vip.yaml and vip.yaml. One of these files was missing ControlPlaneNetwork, since it wasn't used inside the template. Unfortunately, tuskar chokes on this, even though Heat can build the stack just fine. This change makes the vip.yaml and ctlplane_vip.yaml equivalent by adding ControlPlaneNetwork to the vip.yaml template. Change-Id: Ic20281e58a1130afe18d5aec505a3df199841fd5
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